diff mbox

[oe,meta-qt5] qtbase-native: Fix qdbuscpp2xml segfault

Message ID 20170711181353.4404-1-raj.khem@gmail.com
State New
Headers show

Commit Message

Khem Raj July 11, 2017, 6:13 p.m. UTC
0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch alone was causing
qdbuscpp2xml to simply segfault on simple invocation

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Andreas Müller <schnitzeltony@googlemail.com>
---
 recipes-qt/qt5/qtbase-native_git.bb                |  1 -
 ...l.pro-do-not-build-with-bootstrapped-depe.patch | 79 ----------------------
 2 files changed, 80 deletions(-)
 delete mode 100644 recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch

Comments

Martin Kelly July 12, 2017, 12:13 a.m. UTC | #1
Thanks! This bug has been bothering me for a while now, and the patch 
fixes the issue for me.

On 07/11/2017 11:13 AM, Khem Raj wrote:
> 0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch alone was causing
> qdbuscpp2xml to simply segfault on simple invocation
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> Cc: Andreas Müller <schnitzeltony@googlemail.com>
> ---
>  recipes-qt/qt5/qtbase-native_git.bb                |  1 -
>  ...l.pro-do-not-build-with-bootstrapped-depe.patch | 79 ----------------------
>  2 files changed, 80 deletions(-)
>  delete mode 100644 recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch
>
> diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
> index da69812..98cbecc 100644
> --- a/recipes-qt/qt5/qtbase-native_git.bb
> +++ b/recipes-qt/qt5/qtbase-native_git.bb
> @@ -33,7 +33,6 @@ SRC_URI += "\
>  # common for qtbase-native and nativesdk-qtbase
>  SRC_URI += " \
>      file://0011-Always-build-uic.patch \
> -    file://0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch \
>  "
>
>  CLEANBROKEN = "1"
> diff --git a/recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch b/recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch
> deleted file mode 100644
> index e72601c..0000000
> --- a/recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch
> +++ /dev/null
> @@ -1,79 +0,0 @@
> -From 86ae0ce931edbe0ac30cfe5f94f681f1d055fdb0 Mon Sep 17 00:00:00 2001
> -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
> -Date: Mon, 6 Mar 2017 11:50:38 +0100
> -Subject: [PATCH] qdbuscpp2xml.pro: do not build with bootstrapped
> - dependenciies
> -MIME-Version: 1.0
> -Content-Type: text/plain; charset=UTF-8
> -Content-Transfer-Encoding: 8bit
> -
> -Upstream-Status: Pending
> -
> -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ----
> - src/src.pro                             | 9 ++-------
> - src/tools/qdbuscpp2xml/qdbuscpp2xml.pro | 3 +--
> - src/tools/qdbusxml2cpp/qdbusxml2cpp.pro | 5 +----
> - 3 files changed, 4 insertions(+), 13 deletions(-)
> -
> -diff --git a/src/src.pro b/src/src.pro
> -index 90d7e2b..0aaf604 100644
> ---- a/src/src.pro
> -+++ b/src/src.pro
> -@@ -4,9 +4,6 @@ QT_FOR_CONFIG += gui-private
> - include($$OUT_PWD/corelib/qtcore-config.pri)
> - include($$OUT_PWD/gui/qtgui-config.pri)
> -
> --force_bootstrap|!qtConfig(commandlineparser): \
> --    CONFIG += force_dbus_bootstrap
> --
> - src_qtzlib.file = $$PWD/corelib/qtzlib.pro
> - src_qtzlib.target = sub-zlib
> -
> -@@ -37,13 +34,11 @@ src_tools_bootstrap_dbus.depends = src_tools_bootstrap
> -
> - src_tools_qdbusxml2cpp.subdir = tools/qdbusxml2cpp
> - src_tools_qdbusxml2cpp.target = sub-qdbusxml2cpp
> --force_dbus_bootstrap: src_tools_qdbusxml2cpp.depends = src_tools_bootstrap_dbus
> --else: src_tools_qdbusxml2cpp.depends = src_dbus
> -+src_tools_qdbusxml2cpp.depends = src_dbus
> -
> - src_tools_qdbuscpp2xml.subdir = tools/qdbuscpp2xml
> - src_tools_qdbuscpp2xml.target = sub-qdbuscpp2xml
> --force_bootstrap: src_tools_qdbuscpp2xml.depends = src_tools_bootstrap_dbus
> --else: src_tools_qdbuscpp2xml.depends = src_dbus
> -+src_tools_qdbuscpp2xml.depends = src_dbus
> -
> - src_winmain.subdir = $$PWD/winmain
> - src_winmain.target = sub-winmain
> -diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
> -index 5ac3159..74c507c 100644
> ---- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
> -+++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
> -@@ -1,7 +1,6 @@
> - option(host_build)
> - QT = core-private
> --force_bootstrap: QT += bootstrap_dbus-private
> --else: QT += dbus-private
> -+QT += dbus-private
> - DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_FOREACH
> - QMAKE_CXXFLAGS += $$QT_HOST_CFLAGS_DBUS
> -
> -diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
> -index d9ee5de..e891103 100644
> ---- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
> -+++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
> -@@ -1,9 +1,6 @@
> - option(host_build)
> --!force_bootstrap:!qtConfig(commandlineparser): \
> --    CONFIG += force_bootstrap
> - QT = core-private
> --force_bootstrap: QT += bootstrap_dbus-private
> --else: QT += dbus-private
> -+QT += dbus-private
> - DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_FOREACH
> - QMAKE_CXXFLAGS += $$QT_HOST_CFLAGS_DBUS
> -
> ---
> -2.9.3
> -
>
Martin Jansa July 12, 2017, 7:30 a.m. UTC | #2
Is this meant to be applied only for 5.9 or are you seeing this issue with
5.8 as well?

On Wed, Jul 12, 2017 at 1:13 AM, Martin Kelly <mkelly@xevo.com> wrote:

> Thanks! This bug has been bothering me for a while now, and the patch
> fixes the issue for me.
>
>
> On 07/11/2017 11:13 AM, Khem Raj wrote:
>
>> 0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch alone
>> was causing
>> qdbuscpp2xml to simply segfault on simple invocation
>>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> Cc: Andreas Müller <schnitzeltony@googlemail.com>
>> ---
>>  recipes-qt/qt5/qtbase-native_git.bb                |  1 -
>>  ...l.pro-do-not-build-with-bootstrapped-depe.patch | 79
>> ----------------------
>>  2 files changed, 80 deletions(-)
>>  delete mode 100644 recipes-qt/qt5/qtbase/0012-qdb
>> uscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch
>>
>> diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/
>> qtbase-native_git.bb
>> index da69812..98cbecc 100644
>> --- a/recipes-qt/qt5/qtbase-native_git.bb
>> +++ b/recipes-qt/qt5/qtbase-native_git.bb
>> @@ -33,7 +33,6 @@ SRC_URI += "\
>>  # common for qtbase-native and nativesdk-qtbase
>>  SRC_URI += " \
>>      file://0011-Always-build-uic.patch \
>> -    file://0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch
>> \
>>  "
>>
>>  CLEANBROKEN = "1"
>> diff --git a/recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch
>> b/recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-w
>> ith-bootstrapped-depe.patch
>> deleted file mode 100644
>> index e72601c..0000000
>> --- a/recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-w
>> ith-bootstrapped-depe.patch
>> +++ /dev/null
>> @@ -1,79 +0,0 @@
>> -From 86ae0ce931edbe0ac30cfe5f94f681f1d055fdb0 Mon Sep 17 00:00:00 2001
>> -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
>> -Date: Mon, 6 Mar 2017 11:50:38 +0100
>> -Subject: [PATCH] qdbuscpp2xml.pro: do not build with bootstrapped
>> - dependenciies
>> -MIME-Version: 1.0
>> -Content-Type: text/plain; charset=UTF-8
>> -Content-Transfer-Encoding: 8bit
>> -
>> -Upstream-Status: Pending
>> -
>> -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
>> ----
>> - src/src.pro                             | 9 ++-------
>> - src/tools/qdbuscpp2xml/qdbuscpp2xml.pro | 3 +--
>> - src/tools/qdbusxml2cpp/qdbusxml2cpp.pro | 5 +----
>> - 3 files changed, 4 insertions(+), 13 deletions(-)
>> -
>> -diff --git a/src/src.pro b/src/src.pro
>> -index 90d7e2b..0aaf604 100644
>> ---- a/src/src.pro
>> -+++ b/src/src.pro
>> -@@ -4,9 +4,6 @@ QT_FOR_CONFIG += gui-private
>> - include($$OUT_PWD/corelib/qtcore-config.pri)
>> - include($$OUT_PWD/gui/qtgui-config.pri)
>> -
>> --force_bootstrap|!qtConfig(commandlineparser): \
>> --    CONFIG += force_dbus_bootstrap
>> --
>> - src_qtzlib.file = $$PWD/corelib/qtzlib.pro
>> - src_qtzlib.target = sub-zlib
>> -
>> -@@ -37,13 +34,11 @@ src_tools_bootstrap_dbus.depends =
>> src_tools_bootstrap
>> -
>> - src_tools_qdbusxml2cpp.subdir = tools/qdbusxml2cpp
>> - src_tools_qdbusxml2cpp.target = sub-qdbusxml2cpp
>> --force_dbus_bootstrap: src_tools_qdbusxml2cpp.depends =
>> src_tools_bootstrap_dbus
>> --else: src_tools_qdbusxml2cpp.depends = src_dbus
>> -+src_tools_qdbusxml2cpp.depends = src_dbus
>> -
>> - src_tools_qdbuscpp2xml.subdir = tools/qdbuscpp2xml
>> - src_tools_qdbuscpp2xml.target = sub-qdbuscpp2xml
>> --force_bootstrap: src_tools_qdbuscpp2xml.depends =
>> src_tools_bootstrap_dbus
>> --else: src_tools_qdbuscpp2xml.depends = src_dbus
>> -+src_tools_qdbuscpp2xml.depends = src_dbus
>> -
>> - src_winmain.subdir = $$PWD/winmain
>> - src_winmain.target = sub-winmain
>> -diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
>> b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
>> -index 5ac3159..74c507c 100644
>> ---- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
>> -+++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
>> -@@ -1,7 +1,6 @@
>> - option(host_build)
>> - QT = core-private
>> --force_bootstrap: QT += bootstrap_dbus-private
>> --else: QT += dbus-private
>> -+QT += dbus-private
>> - DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_FOREACH
>> - QMAKE_CXXFLAGS += $$QT_HOST_CFLAGS_DBUS
>> -
>> -diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
>> b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
>> -index d9ee5de..e891103 100644
>> ---- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
>> -+++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
>> -@@ -1,9 +1,6 @@
>> - option(host_build)
>> --!force_bootstrap:!qtConfig(commandlineparser): \
>> --    CONFIG += force_bootstrap
>> - QT = core-private
>> --force_bootstrap: QT += bootstrap_dbus-private
>> --else: QT += dbus-private
>> -+QT += dbus-private
>> - DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_FOREACH
>> - QMAKE_CXXFLAGS += $$QT_HOST_CFLAGS_DBUS
>> -
>> ---
>> -2.9.3
>> -
>>
>> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
Khem Raj July 12, 2017, 1:13 p.m. UTC | #3
On Wed, Jul 12, 2017 at 12:30 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> Is this meant to be applied only for 5.9 or are you seeing this issue with
> 5.8 as well?
>

for 5.8, i havent tested 5.9

> On Wed, Jul 12, 2017 at 1:13 AM, Martin Kelly <mkelly@xevo.com> wrote:
>>
>> Thanks! This bug has been bothering me for a while now, and the patch
>> fixes the issue for me.
>>
>>
>> On 07/11/2017 11:13 AM, Khem Raj wrote:
>>>
>>> 0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch alone was
>>> causing
>>> qdbuscpp2xml to simply segfault on simple invocation
>>>
>>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>>> Cc: Andreas Müller <schnitzeltony@googlemail.com>
>>> ---
>>>  recipes-qt/qt5/qtbase-native_git.bb                |  1 -
>>>  ...l.pro-do-not-build-with-bootstrapped-depe.patch | 79
>>> ----------------------
>>>  2 files changed, 80 deletions(-)
>>>  delete mode 100644
>>> recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch
>>>
>>> diff --git a/recipes-qt/qt5/qtbase-native_git.bb
>>> b/recipes-qt/qt5/qtbase-native_git.bb
>>> index da69812..98cbecc 100644
>>> --- a/recipes-qt/qt5/qtbase-native_git.bb
>>> +++ b/recipes-qt/qt5/qtbase-native_git.bb
>>> @@ -33,7 +33,6 @@ SRC_URI += "\
>>>  # common for qtbase-native and nativesdk-qtbase
>>>  SRC_URI += " \
>>>      file://0011-Always-build-uic.patch \
>>> -
>>> file://0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch \
>>>  "
>>>
>>>  CLEANBROKEN = "1"
>>> diff --git
>>> a/recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch
>>> b/recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch
>>> deleted file mode 100644
>>> index e72601c..0000000
>>> ---
>>> a/recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch
>>> +++ /dev/null
>>> @@ -1,79 +0,0 @@
>>> -From 86ae0ce931edbe0ac30cfe5f94f681f1d055fdb0 Mon Sep 17 00:00:00 2001
>>> -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
>>> -Date: Mon, 6 Mar 2017 11:50:38 +0100
>>> -Subject: [PATCH] qdbuscpp2xml.pro: do not build with bootstrapped
>>> - dependenciies
>>> -MIME-Version: 1.0
>>> -Content-Type: text/plain; charset=UTF-8
>>> -Content-Transfer-Encoding: 8bit
>>> -
>>> -Upstream-Status: Pending
>>> -
>>> -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
>>> ----
>>> - src/src.pro                             | 9 ++-------
>>> - src/tools/qdbuscpp2xml/qdbuscpp2xml.pro | 3 +--
>>> - src/tools/qdbusxml2cpp/qdbusxml2cpp.pro | 5 +----
>>> - 3 files changed, 4 insertions(+), 13 deletions(-)
>>> -
>>> -diff --git a/src/src.pro b/src/src.pro
>>> -index 90d7e2b..0aaf604 100644
>>> ---- a/src/src.pro
>>> -+++ b/src/src.pro
>>> -@@ -4,9 +4,6 @@ QT_FOR_CONFIG += gui-private
>>> - include($$OUT_PWD/corelib/qtcore-config.pri)
>>> - include($$OUT_PWD/gui/qtgui-config.pri)
>>> -
>>> --force_bootstrap|!qtConfig(commandlineparser): \
>>> --    CONFIG += force_dbus_bootstrap
>>> --
>>> - src_qtzlib.file = $$PWD/corelib/qtzlib.pro
>>> - src_qtzlib.target = sub-zlib
>>> -
>>> -@@ -37,13 +34,11 @@ src_tools_bootstrap_dbus.depends =
>>> src_tools_bootstrap
>>> -
>>> - src_tools_qdbusxml2cpp.subdir = tools/qdbusxml2cpp
>>> - src_tools_qdbusxml2cpp.target = sub-qdbusxml2cpp
>>> --force_dbus_bootstrap: src_tools_qdbusxml2cpp.depends =
>>> src_tools_bootstrap_dbus
>>> --else: src_tools_qdbusxml2cpp.depends = src_dbus
>>> -+src_tools_qdbusxml2cpp.depends = src_dbus
>>> -
>>> - src_tools_qdbuscpp2xml.subdir = tools/qdbuscpp2xml
>>> - src_tools_qdbuscpp2xml.target = sub-qdbuscpp2xml
>>> --force_bootstrap: src_tools_qdbuscpp2xml.depends =
>>> src_tools_bootstrap_dbus
>>> --else: src_tools_qdbuscpp2xml.depends = src_dbus
>>> -+src_tools_qdbuscpp2xml.depends = src_dbus
>>> -
>>> - src_winmain.subdir = $$PWD/winmain
>>> - src_winmain.target = sub-winmain
>>> -diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
>>> b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
>>> -index 5ac3159..74c507c 100644
>>> ---- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
>>> -+++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
>>> -@@ -1,7 +1,6 @@
>>> - option(host_build)
>>> - QT = core-private
>>> --force_bootstrap: QT += bootstrap_dbus-private
>>> --else: QT += dbus-private
>>> -+QT += dbus-private
>>> - DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_FOREACH
>>> - QMAKE_CXXFLAGS += $$QT_HOST_CFLAGS_DBUS
>>> -
>>> -diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
>>> b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
>>> -index d9ee5de..e891103 100644
>>> ---- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
>>> -+++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
>>> -@@ -1,9 +1,6 @@
>>> - option(host_build)
>>> --!force_bootstrap:!qtConfig(commandlineparser): \
>>> --    CONFIG += force_bootstrap
>>> - QT = core-private
>>> --force_bootstrap: QT += bootstrap_dbus-private
>>> --else: QT += dbus-private
>>> -+QT += dbus-private
>>> - DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_FOREACH
>>> - QMAKE_CXXFLAGS += $$QT_HOST_CFLAGS_DBUS
>>> -
>>> ---
>>> -2.9.3
>>> -
>>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
>
Andreas Müller July 12, 2017, 2:50 p.m. UTC | #4
On Wed, Jul 12, 2017 at 3:13 PM, Khem Raj <raj.khem@gmail.com> wrote:
> On Wed, Jul 12, 2017 at 12:30 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
>> Is this meant to be applied only for 5.9 or are you seeing this issue with
>> 5.8 as well?
>>
>
> for 5.8, i havent tested 5.9
>
>> On Wed, Jul 12, 2017 at 1:13 AM, Martin Kelly <mkelly@xevo.com> wrote:
>>>
>>> Thanks! This bug has been bothering me for a while now, and the patch
>>> fixes the issue for me.
>>>
I think the patch does not cause trouble for Qt <= 5.8 installed on
build host. It seems that 5.9 for host is the crashing combination.

As the author of the patch:

* I am aware that removing this patch causes kde balloo build errors
for cross 5.8 (current)
* I hope moving cross 5.9 (future hopefully) will fix issues properly
* the patch seems to do the wrong thing: it causes dependencies on
build host's libraries

So

Acked-by: Andreas Müller <schnitzeltony@googlemail.com>

Andreas
Martin Kelly July 12, 2017, 4:32 p.m. UTC | #5
On 07/12/2017 06:13 AM, Khem Raj wrote:
> On Wed, Jul 12, 2017 at 12:30 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
>> Is this meant to be applied only for 5.9 or are you seeing this issue with
>> 5.8 as well?
>>
>
> for 5.8, i havent tested 5.9
>

Same for me.

>> On Wed, Jul 12, 2017 at 1:13 AM, Martin Kelly <mkelly@xevo.com> wrote:
>>>
>>> Thanks! This bug has been bothering me for a while now, and the patch
>>> fixes the issue for me.
>>>
>>>
>>> On 07/11/2017 11:13 AM, Khem Raj wrote:
>>>>
>>>> 0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch alone was
>>>> causing
>>>> qdbuscpp2xml to simply segfault on simple invocation
>>>>
>>>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>>>> Cc: Andreas Müller <schnitzeltony@googlemail.com>
>>>> ---
>>>>  recipes-qt/qt5/qtbase-native_git.bb                |  1 -
>>>>  ...l.pro-do-not-build-with-bootstrapped-depe.patch | 79
>>>> ----------------------
>>>>  2 files changed, 80 deletions(-)
>>>>  delete mode 100644
>>>> recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch
>>>>
>>>> diff --git a/recipes-qt/qt5/qtbase-native_git.bb
>>>> b/recipes-qt/qt5/qtbase-native_git.bb
>>>> index da69812..98cbecc 100644
>>>> --- a/recipes-qt/qt5/qtbase-native_git.bb
>>>> +++ b/recipes-qt/qt5/qtbase-native_git.bb
>>>> @@ -33,7 +33,6 @@ SRC_URI += "\
>>>>  # common for qtbase-native and nativesdk-qtbase
>>>>  SRC_URI += " \
>>>>      file://0011-Always-build-uic.patch \
>>>> -
>>>> file://0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch \
>>>>  "
>>>>
>>>>  CLEANBROKEN = "1"
>>>> diff --git
>>>> a/recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch
>>>> b/recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch
>>>> deleted file mode 100644
>>>> index e72601c..0000000
>>>> ---
>>>> a/recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch
>>>> +++ /dev/null
>>>> @@ -1,79 +0,0 @@
>>>> -From 86ae0ce931edbe0ac30cfe5f94f681f1d055fdb0 Mon Sep 17 00:00:00 2001
>>>> -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
>>>> -Date: Mon, 6 Mar 2017 11:50:38 +0100
>>>> -Subject: [PATCH] qdbuscpp2xml.pro: do not build with bootstrapped
>>>> - dependenciies
>>>> -MIME-Version: 1.0
>>>> -Content-Type: text/plain; charset=UTF-8
>>>> -Content-Transfer-Encoding: 8bit
>>>> -
>>>> -Upstream-Status: Pending
>>>> -
>>>> -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
>>>> ----
>>>> - src/src.pro                             | 9 ++-------
>>>> - src/tools/qdbuscpp2xml/qdbuscpp2xml.pro | 3 +--
>>>> - src/tools/qdbusxml2cpp/qdbusxml2cpp.pro | 5 +----
>>>> - 3 files changed, 4 insertions(+), 13 deletions(-)
>>>> -
>>>> -diff --git a/src/src.pro b/src/src.pro
>>>> -index 90d7e2b..0aaf604 100644
>>>> ---- a/src/src.pro
>>>> -+++ b/src/src.pro
>>>> -@@ -4,9 +4,6 @@ QT_FOR_CONFIG += gui-private
>>>> - include($$OUT_PWD/corelib/qtcore-config.pri)
>>>> - include($$OUT_PWD/gui/qtgui-config.pri)
>>>> -
>>>> --force_bootstrap|!qtConfig(commandlineparser): \
>>>> --    CONFIG += force_dbus_bootstrap
>>>> --
>>>> - src_qtzlib.file = $$PWD/corelib/qtzlib.pro
>>>> - src_qtzlib.target = sub-zlib
>>>> -
>>>> -@@ -37,13 +34,11 @@ src_tools_bootstrap_dbus.depends =
>>>> src_tools_bootstrap
>>>> -
>>>> - src_tools_qdbusxml2cpp.subdir = tools/qdbusxml2cpp
>>>> - src_tools_qdbusxml2cpp.target = sub-qdbusxml2cpp
>>>> --force_dbus_bootstrap: src_tools_qdbusxml2cpp.depends =
>>>> src_tools_bootstrap_dbus
>>>> --else: src_tools_qdbusxml2cpp.depends = src_dbus
>>>> -+src_tools_qdbusxml2cpp.depends = src_dbus
>>>> -
>>>> - src_tools_qdbuscpp2xml.subdir = tools/qdbuscpp2xml
>>>> - src_tools_qdbuscpp2xml.target = sub-qdbuscpp2xml
>>>> --force_bootstrap: src_tools_qdbuscpp2xml.depends =
>>>> src_tools_bootstrap_dbus
>>>> --else: src_tools_qdbuscpp2xml.depends = src_dbus
>>>> -+src_tools_qdbuscpp2xml.depends = src_dbus
>>>> -
>>>> - src_winmain.subdir = $$PWD/winmain
>>>> - src_winmain.target = sub-winmain
>>>> -diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
>>>> b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
>>>> -index 5ac3159..74c507c 100644
>>>> ---- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
>>>> -+++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
>>>> -@@ -1,7 +1,6 @@
>>>> - option(host_build)
>>>> - QT = core-private
>>>> --force_bootstrap: QT += bootstrap_dbus-private
>>>> --else: QT += dbus-private
>>>> -+QT += dbus-private
>>>> - DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_FOREACH
>>>> - QMAKE_CXXFLAGS += $$QT_HOST_CFLAGS_DBUS
>>>> -
>>>> -diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
>>>> b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
>>>> -index d9ee5de..e891103 100644
>>>> ---- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
>>>> -+++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
>>>> -@@ -1,9 +1,6 @@
>>>> - option(host_build)
>>>> --!force_bootstrap:!qtConfig(commandlineparser): \
>>>> --    CONFIG += force_bootstrap
>>>> - QT = core-private
>>>> --force_bootstrap: QT += bootstrap_dbus-private
>>>> --else: QT += dbus-private
>>>> -+QT += dbus-private
>>>> - DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_FOREACH
>>>> - QMAKE_CXXFLAGS += $$QT_HOST_CFLAGS_DBUS
>>>> -
>>>> ---
>>>> -2.9.3
>>>> -
>>>>
>>> --
>>> _______________________________________________
>>> Openembedded-devel mailing list
>>> Openembedded-devel@lists.openembedded.org
>>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>>
>>
Martin Kelly July 12, 2017, 6:37 p.m. UTC | #6
On 07/12/2017 07:50 AM, Andreas Müller wrote:
> On Wed, Jul 12, 2017 at 3:13 PM, Khem Raj <raj.khem@gmail.com> wrote:
>> On Wed, Jul 12, 2017 at 12:30 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
>>> Is this meant to be applied only for 5.9 or are you seeing this issue with
>>> 5.8 as well?
>>>
>>
>> for 5.8, i havent tested 5.9
>>
>>> On Wed, Jul 12, 2017 at 1:13 AM, Martin Kelly <mkelly@xevo.com> wrote:
>>>>
>>>> Thanks! This bug has been bothering me for a while now, and the patch
>>>> fixes the issue for me.
>>>>
> I think the patch does not cause trouble for Qt <= 5.8 installed on
> build host. It seems that 5.9 for host is the crashing combination.
>

I don't have 5.9 on my host. Specifically, I started noticing this when 
I upgraded from Debian Jessie to Debian Stretch. Jessie had Qt 5.3.2 
while Stretch has Qt 5.7.1.

> As the author of the patch:
>
> * I am aware that removing this patch causes kde balloo build errors
> for cross 5.8 (current)
> * I hope moving cross 5.9 (future hopefully) will fix issues properly
> * the patch seems to do the wrong thing: it causes dependencies on
> build host's libraries
>
> So
>
> Acked-by: Andreas Müller <schnitzeltony@googlemail.com>
>
> Andreas
>
diff mbox

Patch

diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index da69812..98cbecc 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -33,7 +33,6 @@  SRC_URI += "\
 # common for qtbase-native and nativesdk-qtbase
 SRC_URI += " \
     file://0011-Always-build-uic.patch \
-    file://0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch \
 "
 
 CLEANBROKEN = "1"
diff --git a/recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch b/recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch
deleted file mode 100644
index e72601c..0000000
--- a/recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch
+++ /dev/null
@@ -1,79 +0,0 @@ 
-From 86ae0ce931edbe0ac30cfe5f94f681f1d055fdb0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Mon, 6 Mar 2017 11:50:38 +0100
-Subject: [PATCH] qdbuscpp2xml.pro: do not build with bootstrapped
- dependenciies
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
----
- src/src.pro                             | 9 ++-------
- src/tools/qdbuscpp2xml/qdbuscpp2xml.pro | 3 +--
- src/tools/qdbusxml2cpp/qdbusxml2cpp.pro | 5 +----
- 3 files changed, 4 insertions(+), 13 deletions(-)
-
-diff --git a/src/src.pro b/src/src.pro
-index 90d7e2b..0aaf604 100644
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -4,9 +4,6 @@ QT_FOR_CONFIG += gui-private
- include($$OUT_PWD/corelib/qtcore-config.pri)
- include($$OUT_PWD/gui/qtgui-config.pri)
- 
--force_bootstrap|!qtConfig(commandlineparser): \
--    CONFIG += force_dbus_bootstrap
--
- src_qtzlib.file = $$PWD/corelib/qtzlib.pro
- src_qtzlib.target = sub-zlib
- 
-@@ -37,13 +34,11 @@ src_tools_bootstrap_dbus.depends = src_tools_bootstrap
- 
- src_tools_qdbusxml2cpp.subdir = tools/qdbusxml2cpp
- src_tools_qdbusxml2cpp.target = sub-qdbusxml2cpp
--force_dbus_bootstrap: src_tools_qdbusxml2cpp.depends = src_tools_bootstrap_dbus
--else: src_tools_qdbusxml2cpp.depends = src_dbus
-+src_tools_qdbusxml2cpp.depends = src_dbus
- 
- src_tools_qdbuscpp2xml.subdir = tools/qdbuscpp2xml
- src_tools_qdbuscpp2xml.target = sub-qdbuscpp2xml
--force_bootstrap: src_tools_qdbuscpp2xml.depends = src_tools_bootstrap_dbus
--else: src_tools_qdbuscpp2xml.depends = src_dbus
-+src_tools_qdbuscpp2xml.depends = src_dbus
- 
- src_winmain.subdir = $$PWD/winmain
- src_winmain.target = sub-winmain
-diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
-index 5ac3159..74c507c 100644
---- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
-+++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
-@@ -1,7 +1,6 @@
- option(host_build)
- QT = core-private
--force_bootstrap: QT += bootstrap_dbus-private
--else: QT += dbus-private
-+QT += dbus-private
- DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_FOREACH
- QMAKE_CXXFLAGS += $$QT_HOST_CFLAGS_DBUS
- 
-diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
-index d9ee5de..e891103 100644
---- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
-+++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
-@@ -1,9 +1,6 @@
- option(host_build)
--!force_bootstrap:!qtConfig(commandlineparser): \
--    CONFIG += force_bootstrap
- QT = core-private
--force_bootstrap: QT += bootstrap_dbus-private
--else: QT += dbus-private
-+QT += dbus-private
- DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_FOREACH
- QMAKE_CXXFLAGS += $$QT_HOST_CFLAGS_DBUS
- 
--- 
-2.9.3
-