git » qt5-base.git » commit 0755bdb

Add -ltcg to default qmake flags, otherwise there are build issues with LTO

author Antonio Rojas
2022-02-11 14:41:37 UTC
committer Antonio Rojas
2022-02-11 14:41:37 UTC
parent 29ff6aa1b8e4f617abc3c900a9ea317e0450a230

Add -ltcg to default qmake flags, otherwise there are build issues with LTO

PKGBUILD +6 -6
qt5-base-cflags.patch => qmake-cflags.patch +0 -0
qt5-base-nostrip.patch => qmake-config.patch +1 -1

diff --git a/PKGBUILD b/PKGBUILD
index ca22371..c3fd232 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 pkgbase=qt5-base
 pkgname=(qt5-base qt5-xcb-private-headers)
 pkgver=5.15.2+kde+r297
-pkgrel=1
+pkgrel=2
 _commit=d16bf02a11953dcac01dca73e6f3778f293adefe
 arch=('x86_64')
 url='https://www.qt.io'
@@ -29,11 +29,11 @@ conflicts=('qtchooser')
 groups=('qt' 'qt5')
 _pkgfqn=qtbase
 source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit
-        qt5-base-cflags.patch
-        qt5-base-nostrip.patch)
+        qmake-cflags.patch
+        qmake-config.patch)
 sha256sums=('SKIP'
             '5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78'
-            '4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094')
+            '4abc22150fa3e06b2fdcec32146abc9be4e316692aa4d5bd5aa53b4b726783fa')
 options=(debug)
 
 pkgver() {
@@ -46,8 +46,8 @@ prepare() {
 
   git revert -n 6344955d17e17e2398720fe60c34cfc2a4a95208 # Revert version bump
 
-  patch -p1 < ../qt5-base-cflags.patch # Use system CFLAGS in qmake
-  patch -p1 < ../qt5-base-nostrip.patch # Don't strip binaries with qmake
+  patch -p1 < ../qmake-cflags.patch # Use system CFLAGS in qmake
+  patch -p1 < ../qmake-config.patch # Don't strip binaries with qmake and use -ltcg, cf. QTBUG-73834
 }
 
 build() {
diff --git a/qt5-base-cflags.patch b/qmake-cflags.patch
similarity index 100%
rename from qt5-base-cflags.patch
rename to qmake-cflags.patch
diff --git a/qt5-base-nostrip.patch b/qmake-config.patch
similarity index 93%
rename from qt5-base-nostrip.patch
rename to qmake-config.patch
index 17d24b4..77d9694 100644
--- a/qt5-base-nostrip.patch
+++ b/qmake-config.patch
@@ -6,7 +6,7 @@ index 99d77156fd..fc840fe9f6 100644
  # you can use the manual test in tests/manual/mkspecs.
  #
  
-+CONFIG += nostrip
++CONFIG += nostrip ltcg
 +
  QMAKE_CFLAGS_OPTIMIZE      = -O2
  QMAKE_CFLAGS_OPTIMIZE_FULL = -O3