[oe] [meta-qt5][PATCH] qtbase: replace host paths with qmake built-in properties in qconfig.pri

[Denys Dmytriyenko]

On Fri, Aug 28, 2015 at 06:46:04PM +1000, Jonathan Liu wrote:
> Hi Khem,
> 
> On 28 August 2015 at 15:57, Khem Raj <raj.khem at gmail.com> wrote:
> > Denys
> >
> > I have posted an incremental fix, here
> > https://github.com/meta-qt5/meta-qt5/commit/a0a5002ed4bfcce50d6462897c4701246061581a
> >
> > Jonathan
> >
> > Can you see if it still fixes the usecase that you originally were trying to fix ?
> 
> Your patch misses some host paths that aren't in
> ${STAGING_DIR_HOST}/usr (referred to as ${STAGING_EXECPREFIXDIR} in
> your patch):
> ${STAGING_DIR_HOST}/lib
> ${STAGING_DIR_HOST}
> 
> You can change the following in your patch:
> -e 's| ${STAGING_EXECPREFIXDIR}| $$[QT_INSTALL_PREFIX]|g' \
> 
> To:
> -e 's| ${STAGING_DIR_HOST}| $$[QT_SYSROOT]|g' \
> 
> So that it covers the host paths missed by sed.
> 
> Regards,
> Jonathan

Ping on this one. Did we get an updated fix for it? Sorry, I was busy lately 
with own releases and wasn't paying attention, but the tip of meta-qt5 is 
still broken on qtwebkit. Thanks.

-- 
Denys


> >> On Aug 27, 2015, at 7:15 AM, Denys Dmytriyenko <denis at denix.org> wrote:
> >>
> >> This seems to cause a build issue in qtwebkit and qtwebengine as well.
> >>
> >> It manifests in not being able to find glib.h or gio/gio.h headers.
> >>
> >> Khem, Martin and I are still discussing this on IRC, but I propose to revert
> >> this commit until it's tested better for all modules.
> >>
> >> --
> >> Denys
> >>
> >>
> >> On Sun, Aug 23, 2015 at 10:16:49PM +1000, Jonathan Liu wrote:
> >>> This avoids qconfig.pri in the Qt SDK incorrectly including paths from
> >>> the build host that may not exist on the SDK host. As the paths are
> >>> now correct, qmake can correctly detect system include paths and use
> >>> -isystem instead of -I for Qt's include directories which allows the
> >>> suppression of warnings from library headers when building Qt
> >>> applications.
> >>>
> >>> Signed-off-by: Jonathan Liu <net147 at gmail.com>
> >>> ---
> >>> recipes-qt/qt5/qtbase_git.bb | 5 +++++
> >>> 1 file changed, 5 insertions(+)
> >>>
> >>> diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
> >>> index ae63150..324a115 100644
> >>> --- a/recipes-qt/qt5/qtbase_git.bb
> >>> +++ b/recipes-qt/qt5/qtbase_git.bb
> >>> @@ -234,6 +234,11 @@ do_install_append() {
> >>>     # Remove macx-ios-clang directory because /usr/lib/qt5/mkspecs/macx-ios-clang/rename_main.sh:#!/bin/bash
> >>>     # triggers QA Issue: qtbase-mkspecs requires /bin/bash, but no providers in its RDEPENDS [file-rdeps]
> >>>     rm -rf ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/macx-ios-clang
> >>> +
> >>> +    # Replace host paths with qmake built-in properties
> >>> +    sed -i -e 's| ${STAGING_DIR_NATIVE}| $$[QT_HOST_PREFIX]|g' \
> >>> +        -e 's| ${STAGING_DIR_HOST}| $$[QT_INSTALL_PREFIX]|g' \
> >>> +        ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/qconfig.pri
> >>> }
> >>>
> >>> PACKAGES =. " \
> >>> --
> >>> 2.5.0
> >>>
> >>> --
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel