From: Denys Dmytriyenko <denis@denix.org>
To: openembedded-devel@lists.openembedded.org
Subject: Re: [meta-qt5][PATCH] qtbase: replace host paths with qmake built-in properties in qconfig.pri
Date: Thu, 03 Sep 2015 17:42:46 -0400 [thread overview]
Message-ID: <20150903214246.GE8323@denix.org> (raw)
In-Reply-To: <CANwerB1W1iqe72aV2Y4CvytbrE15JnM8ktWgoBTDWhB7w0CgXA@mail.gmail.com>
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@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@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@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@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
next prev parent reply other threads:[~2015-09-03 21:42 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-23 12:16 [meta-qt5][PATCH] qtbase: replace host paths with qmake built-in properties in qconfig.pri Jonathan Liu
2015-08-27 14:15 ` Denys Dmytriyenko
2015-08-28 5:57 ` Khem Raj
2015-08-28 8:46 ` Jonathan Liu
2015-09-03 21:42 ` Denys Dmytriyenko [this message]
2015-09-03 22:02 ` Martin Jansa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150903214246.GE8323@denix.org \
--to=denis@denix.org \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox