From 8f1986c8976684e349508f4a8b3eea366c8f10ed Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Mon, 7 Jan 2019 21:12:22 +0200 Subject: qtbase: update Disable-ltcg-for-host_build.patch This patch was accidentally left out when upstream patch changed patch number and patch names did not match anymore. Reworked patch to be applied on top of upstream patch instead of replacing it. Change-Id: I880669132ec7e57d9784964f935f43249de15821 Reviewed-by: Samuli Piippo --- .../qtbase/0002-Disable-ltcg-for-host_build.patch | 33 ++++++++++++++++++++++ .../qtbase/0015-Disable-ltcg-for-host_build.patch | 33 ---------------------- .../recipes-qt/qt5/qtbase_git.bbappend | 1 + 3 files changed, 34 insertions(+), 33 deletions(-) create mode 100644 meta-boot2qt-distro/recipes-qt/qt5/qtbase/0002-Disable-ltcg-for-host_build.patch delete mode 100644 meta-boot2qt-distro/recipes-qt/qt5/qtbase/0015-Disable-ltcg-for-host_build.patch diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0002-Disable-ltcg-for-host_build.patch b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0002-Disable-ltcg-for-host_build.patch new file mode 100644 index 0000000..b1a755f --- /dev/null +++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0002-Disable-ltcg-for-host_build.patch @@ -0,0 +1,33 @@ +From 4de366eeb48038da4140c3dcb3e96070e7d56429 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Tue, 23 Oct 2018 09:54:57 +0300 +Subject: [PATCH] Disable ltcg for host_build + +debug-prefix-map does not work correctly for static libraries +when using ltcg, and since host_build compilations link agaist +the libQt5Bootstrap.a library, it breaks source file packaging +into debug packages. + +Also disable ltcg when compiling on Windows host platform, +as GCC7 does not support lto with mingw. + +Disable also for static builds since those libraries can be linked +on Windows host, where the lto built binaries won't work. + +Task-number: QTBUG-71230 +Change-Id: I5bea76ea03bf1943b0cfaf03d46a4840bd99a28b +Upstream-Status: Inappropriate [embedded specific] +--- + mkspecs/features/ltcg.prf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mkspecs/features/ltcg.prf b/mkspecs/features/ltcg.prf +index 482e5b5..de00842 100644 +--- a/mkspecs/features/ltcg.prf ++++ b/mkspecs/features/ltcg.prf +@@ -1,4 +1,4 @@ +-CONFIG(release, debug|release):!host_build { ++CONFIG(release, debug|release):!host_build:!equals(QMAKE_HOST.os, Windows):!staticlib { + # We need fat object files when creating static libraries on some platforms + # so the linker will know to load a particular object from the library + # in the first place. On others, we have special ar and nm to create the symbol diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0015-Disable-ltcg-for-host_build.patch b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0015-Disable-ltcg-for-host_build.patch deleted file mode 100644 index a7ee953..0000000 --- a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0015-Disable-ltcg-for-host_build.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 9b541f4f6272c4ed4bb5bf6591e9a65cded6fdfa Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Tue, 23 Oct 2018 09:54:57 +0300 -Subject: [PATCH] Disable ltcg for host_build - -debug-prefix-map does not work correctly for static libraries -when using ltcg, and since host_build compilations link agaist -the libQt5Bootstrap.a library, it breaks source file packaging -into debug packages. - -Also disable ltcg when compiling on Windows host platform, -as GCC7 does not support lto with mingw. - -Disable also for static builds since those libraries can be linked -on Windows host, where the lto built binaries won't work. - -Task-number: QTBUG-71230 -Change-Id: I5bea76ea03bf1943b0cfaf03d46a4840bd99a28b -Upstream-Status: Inappropriate [embedded specific] ---- - mkspecs/features/ltcg.prf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mkspecs/features/ltcg.prf b/mkspecs/features/ltcg.prf -index ccf0226272..00118be872 100644 ---- a/mkspecs/features/ltcg.prf -+++ b/mkspecs/features/ltcg.prf -@@ -1,4 +1,4 @@ --CONFIG(release, debug|release) { -+CONFIG(release, debug|release):!host_build:!equals(QMAKE_HOST.os, Windows):!staticlib { - # We need fat object files when creating static libraries on some platforms - # so the linker will know to load a particular object from the library - # in the first place. On others, we have special ar and nm to create the symbol diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtbase_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt5/qtbase_git.bbappend index 5684832..bd86b68 100644 --- a/meta-boot2qt-distro/recipes-qt/qt5/qtbase_git.bbappend +++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase_git.bbappend @@ -60,6 +60,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += " \ file://oe-device-extra.pri \ file://0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch \ + file://0002-Disable-ltcg-for-host_build.patch \ " do_configure_prepend() { install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs -- cgit v1.2.3-54-g00ecf