* [meta-qt5][PATCH] qtbase: replace host paths with qmake built-in properties in qconfig.pri
@ 2015-08-23 12:16 Jonathan Liu
2015-08-27 14:15 ` Denys Dmytriyenko
0 siblings, 1 reply; 6+ messages in thread
From: Jonathan Liu @ 2015-08-23 12:16 UTC (permalink / raw)
To: openembedded-devel
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [meta-qt5][PATCH] qtbase: replace host paths with qmake built-in properties in qconfig.pri
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
0 siblings, 1 reply; 6+ messages in thread
From: Denys Dmytriyenko @ 2015-08-27 14:15 UTC (permalink / raw)
To: openembedded-devel
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [meta-qt5][PATCH] qtbase: replace host paths with qmake built-in properties in qconfig.pri
2015-08-27 14:15 ` Denys Dmytriyenko
@ 2015-08-28 5:57 ` Khem Raj
2015-08-28 8:46 ` Jonathan Liu
0 siblings, 1 reply; 6+ messages in thread
From: Khem Raj @ 2015-08-28 5:57 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 2496 bytes --]
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 ?
> 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
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 211 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [meta-qt5][PATCH] qtbase: replace host paths with qmake built-in properties in qconfig.pri
2015-08-28 5:57 ` Khem Raj
@ 2015-08-28 8:46 ` Jonathan Liu
2015-09-03 21:42 ` Denys Dmytriyenko
0 siblings, 1 reply; 6+ messages in thread
From: Jonathan Liu @ 2015-08-28 8:46 UTC (permalink / raw)
To: OpenEmbedded Devel List
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
>
>> 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
>>>
>>> --
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [meta-qt5][PATCH] qtbase: replace host paths with qmake built-in properties in qconfig.pri
2015-08-28 8:46 ` Jonathan Liu
@ 2015-09-03 21:42 ` Denys Dmytriyenko
2015-09-03 22:02 ` Martin Jansa
0 siblings, 1 reply; 6+ messages in thread
From: Denys Dmytriyenko @ 2015-09-03 21:42 UTC (permalink / raw)
To: openembedded-devel
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [meta-qt5][PATCH] qtbase: replace host paths with qmake built-in properties in qconfig.pri
2015-09-03 21:42 ` Denys Dmytriyenko
@ 2015-09-03 22:02 ` Martin Jansa
0 siblings, 0 replies; 6+ messages in thread
From: Martin Jansa @ 2015-09-03 22:02 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 3887 bytes --]
On Thu, Sep 03, 2015 at 05:42:46PM -0400, Denys Dmytriyenko wrote:
> 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.
Fix is in master-next waiting for jenkins builds to verify Khem's
version squashed with update from Jonathan.
>
> --
> 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
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-09-03 22:01 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2015-09-03 22:02 ` Martin Jansa
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.