[arch-commits] Commit in qt5-base/trunk (5 files)

Antonio Rojas arojas at gemini.archlinux.org
Fri Feb 11 14:41:37 UTC 2022 

    Date: Friday, February 11, 2022 @ 14:41:37
  Author: arojas
Revision: 436928

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

Added:
  qt5-base/trunk/qmake-cflags.patch
    (from rev 436927, qt5-base/trunk/qt5-base-cflags.patch)
  qt5-base/trunk/qmake-config.patch
    (from rev 436927, qt5-base/trunk/qt5-base-nostrip.patch)
Modified:
  qt5-base/trunk/PKGBUILD
Deleted:
  qt5-base/trunk/qt5-base-cflags.patch
  qt5-base/trunk/qt5-base-nostrip.patch

------------------------+
 PKGBUILD               |   12 ++++++------
 qmake-cflags.patch     |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 qmake-config.patch     |   13 +++++++++++++
 qt5-base-cflags.patch  |   46 ----------------------------------------------
 qt5-base-nostrip.patch |   13 -------------
 5 files changed, 65 insertions(+), 65 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-11 03:14:08 UTC (rev 436927)
+++ PKGBUILD	2022-02-11 14:41:37 UTC (rev 436928)
@@ -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 @@
 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 @@
 
   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() {

Copied: qt5-base/trunk/qmake-cflags.patch (from rev 436927, qt5-base/trunk/qt5-base-cflags.patch)
===================================================================
--- qmake-cflags.patch	                        (rev 0)
+++ qmake-cflags.patch	2022-02-11 14:41:37 UTC (rev 436928)
@@ -0,0 +1,46 @@
+diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
+index a493cd5984..41342f5020 100644
+--- a/mkspecs/common/g++-unix.conf
++++ b/mkspecs/common/g++-unix.conf
+@@ -10,5 +10,6 @@
+ 
+ include(g++-base.conf)
+ 
+-QMAKE_LFLAGS_RELEASE   += -Wl,-O1
++SYSTEM_LDFLAGS = $$(LDFLAGS)
++!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
+ QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
+diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
+index 1f919d270a..7ef6046326 100644
+--- a/mkspecs/common/gcc-base.conf
++++ b/mkspecs/common/gcc-base.conf
+@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
+ QMAKE_CFLAGS_DEPS          += -M
+ QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
+ QMAKE_CFLAGS_WARN_OFF      += -w
+-QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
+-QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
+-QMAKE_CFLAGS_DEBUG         += -g
++SYSTEM_CFLAGS = $$(CFLAGS)
++SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
++!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
++!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
++!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
+ QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
+ QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
+ QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
+@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
+ QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
+ QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
+ QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
+-QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
+-QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
+-QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
++SYSTEM_CXXFLAGS = $$(CXXFLAGS)
++SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
++!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
++!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
++!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
+ QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
+ QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
+ QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP

Copied: qt5-base/trunk/qmake-config.patch (from rev 436927, qt5-base/trunk/qt5-base-nostrip.patch)
===================================================================
--- qmake-config.patch	                        (rev 0)
+++ qmake-config.patch	2022-02-11 14:41:37 UTC (rev 436928)
@@ -0,0 +1,13 @@
+diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
+index 99d77156fd..fc840fe9f6 100644
+--- a/mkspecs/common/gcc-base.conf
++++ b/mkspecs/common/gcc-base.conf
+@@ -31,6 +31,8 @@
+ # you can use the manual test in tests/manual/mkspecs.
+ #
+ 
++CONFIG += nostrip ltcg
++
+ QMAKE_CFLAGS_OPTIMIZE      = -O2
+ QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
+ QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og

Deleted: qt5-base-cflags.patch
===================================================================
--- qt5-base-cflags.patch	2022-02-11 03:14:08 UTC (rev 436927)
+++ qt5-base-cflags.patch	2022-02-11 14:41:37 UTC (rev 436928)
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP

Deleted: qt5-base-nostrip.patch
===================================================================
--- qt5-base-nostrip.patch	2022-02-11 03:14:08 UTC (rev 436927)
+++ qt5-base-nostrip.patch	2022-02-11 14:41:37 UTC (rev 436928)
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
- 
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og

More information about the arch-commits mailing list