summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-boot2qt-distro/recipes-qt/qt5/qtbase/0002-Disable-ltcg-for-host_build.patch (renamed from meta-boot2qt-distro/recipes-qt/qt5/qtbase/0015-Disable-ltcg-for-host_build.patch)6
-rw-r--r--meta-boot2qt-distro/recipes-qt/qt5/qtbase_git.bbappend1
2 files changed, 4 insertions, 3 deletions
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/0002-Disable-ltcg-for-host_build.patch
index a7ee953..b1a755f 100644
--- a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0015-Disable-ltcg-for-host_build.patch
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0002-Disable-ltcg-for-host_build.patch
@@ -1,4 +1,4 @@
1From 9b541f4f6272c4ed4bb5bf6591e9a65cded6fdfa Mon Sep 17 00:00:00 2001 1From 4de366eeb48038da4140c3dcb3e96070e7d56429 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Tue, 23 Oct 2018 09:54:57 +0300 3Date: Tue, 23 Oct 2018 09:54:57 +0300
4Subject: [PATCH] Disable ltcg for host_build 4Subject: [PATCH] Disable ltcg for host_build
@@ -22,11 +22,11 @@ Upstream-Status: Inappropriate [embedded specific]
22 1 file changed, 1 insertion(+), 1 deletion(-) 22 1 file changed, 1 insertion(+), 1 deletion(-)
23 23
24diff --git a/mkspecs/features/ltcg.prf b/mkspecs/features/ltcg.prf 24diff --git a/mkspecs/features/ltcg.prf b/mkspecs/features/ltcg.prf
25index ccf0226272..00118be872 100644 25index 482e5b5..de00842 100644
26--- a/mkspecs/features/ltcg.prf 26--- a/mkspecs/features/ltcg.prf
27+++ b/mkspecs/features/ltcg.prf 27+++ b/mkspecs/features/ltcg.prf
28@@ -1,4 +1,4 @@ 28@@ -1,4 +1,4 @@
29-CONFIG(release, debug|release) { 29-CONFIG(release, debug|release):!host_build {
30+CONFIG(release, debug|release):!host_build:!equals(QMAKE_HOST.os, Windows):!staticlib { 30+CONFIG(release, debug|release):!host_build:!equals(QMAKE_HOST.os, Windows):!staticlib {
31 # We need fat object files when creating static libraries on some platforms 31 # We need fat object files when creating static libraries on some platforms
32 # so the linker will know to load a particular object from the library 32 # so the linker will know to load a particular object from the library
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}:"
60SRC_URI += " \ 60SRC_URI += " \
61 file://oe-device-extra.pri \ 61 file://oe-device-extra.pri \
62 file://0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch \ 62 file://0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch \
63 file://0002-Disable-ltcg-for-host_build.patch \
63 " 64 "
64do_configure_prepend() { 65do_configure_prepend() {
65 install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs 66 install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs