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 <samuli.piippo@qt.io>

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 @@
-From 9b541f4f6272c4ed4bb5bf6591e9a65cded6fdfa Mon Sep 17 00:00:00 2001
+From 4de366eeb48038da4140c3dcb3e96070e7d56429 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Tue, 23 Oct 2018 09:54:57 +0300
 Subject: [PATCH] Disable ltcg for host_build
@@ -22,11 +22,11 @@ Upstream-Status: Inappropriate [embedded specific]
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/mkspecs/features/ltcg.prf b/mkspecs/features/ltcg.prf
-index ccf0226272..00118be872 100644
+index 482e5b5..de00842 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 {
 +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
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