[arch-commits] Commit in qt5-base/trunk (PKGBUILD qt5-base-cflags.patch)

[Antonio Rojas]

    Date: Tuesday, December 21, 2021 @ 20:01:41
  Author: arojas
Revision: 432885

Explicitly enable lto in configure. Otherwise, Qt doesn't disable it for the classes that don't support it. Remove manual CPPFLAGS handling in qmake

Modified:
  qt5-base/trunk/PKGBUILD
  qt5-base/trunk/qt5-base-cflags.patch

-----------------------+
 PKGBUILD              |    7 ++++---
 qt5-base-cflags.patch |    8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-21 19:37:40 UTC (rev 432884)
+++ PKGBUILD	2021-12-21 20:01:41 UTC (rev 432885)
@@ -4,7 +4,7 @@
 pkgbase=qt5-base
 pkgname=(qt5-base qt5-xcb-private-headers)
 pkgver=5.15.2+kde+r263
-pkgrel=2
+pkgrel=3
 _commit=7c6c0030cf80ef7b9ace42996b0e0c3a72f76860
 arch=('x86_64')
 url='https://www.qt.io'
@@ -32,7 +32,7 @@
         qt5-base-cflags.patch
         qt5-base-nostrip.patch)
 sha256sums=('SKIP'
-            'cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c'
+            '5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78'
             '4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094')
 
 pkgver() {
@@ -71,7 +71,8 @@
     -no-mimetype-database \
     -no-use-gold-linker \
     -reduce-relocations \
-    -no-strip
+    -no-strip \
+    -ltcg
   make
 }
 

Modified: qt5-base-cflags.patch
===================================================================
--- qt5-base-cflags.patch	2021-12-21 19:37:40 UTC (rev 432884)
+++ qt5-base-cflags.patch	2021-12-21 20:01:41 UTC (rev 432885)
@@ -23,8 +23,8 @@
 -QMAKE_CFLAGS_DEBUG         += -g
 +SYSTEM_CFLAGS = $$(CFLAGS)
 +SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CPPFLAGS) $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
++!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
@@ -38,8 +38,8 @@
 -QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
 +SYSTEM_CXXFLAGS = $$(CXXFLAGS)
 +SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CPPFLAGS) $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
++!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