[oe] [meta-qt5][PATCH] qtbase-native: Force use of built-in pcre
Martin Jansa
martin.jansa at gmail.com
Fri Sep 22 12:55:27 UTC 2017
On Fri, Sep 22, 2017 at 12:34:15PM +0100, Mike Crowe wrote:
> On Friday 08 September 2017 at 14:48:02 +0100, Mike Crowe wrote:
> > If we specify neither -system-pcre nor -qt-pcre then qtbase will first see
> > if it can find the pcre library in the system and fall back to compiling
> > its own if that's not possible.
> >
> > Unfortunately, this means that if qtbase-native happens to be built on a
> > machine with system pcre available then the resulting binaries such as
> > bin/qt5/uic in sstate files won't work correctly on machines that don't
> > have pcre available. Even ignoring that, it doesn't help for packages to
> > build differently depending on how the build system is configured.
> >
> > We could depend on pcre-native and pass -system-pcre, but this doesn't work
> > by default because qtbase actually requires pcre16 which is an optional
> > (via PACKAGECONFIG) feature of pcre so the default there would need to be
> > changed too.
> >
> > So, let's make qtbase-native match the default of qtbase by passing
> > -qt-pcre in order to ensure that qtbase-native is always built with its
> > own pcre implementation.
> >
> > Signed-off-by: Mike Crowe <mac at mcrowe.com>
> > ---
> > recipes-qt/qt5/qtbase-native_git.bb | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
> > index 54a0b78..0951ede 100644
> > --- a/recipes-qt/qt5/qtbase-native_git.bb
> > +++ b/recipes-qt/qt5/qtbase-native_git.bb
> > @@ -46,6 +46,7 @@ PACKAGECONFIG_CONFARGS = " \
> > -sysroot ${STAGING_DIR_NATIVE} \
> > -no-gcc-sysroot \
> > -system-zlib \
> > + -qt-pcre \
> > -no-libjpeg \
> > -no-libpng \
> > -no-gif \
>
> Does anyone have any objections to this?
>
> We've been using it for several weeks now and it's not caused any observed
> problems.
It's already merged:
https://github.com/meta-qt5/meta-qt5/commit/743b3b93e17f5382fd1f9f4e0d2932501c8a3c78
>
> Thanks.
>
> Mike.
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20170922/a38bbe8b/attachment-0002.sig>
More information about the Openembedded-devel
mailing list