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

[Antonio Rojas]

    Date: Tuesday, December 21, 2021 @ 21:36:11
  Author: arojas
Revision: 432891

Fix build with LTO, remove manual CPPFLAGS handling in qmake

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-21 21:14:34 UTC (rev 432890)
+++ PKGBUILD	2021-12-21 21:36:11 UTC (rev 432891)
@@ -5,7 +5,7 @@
 pkgname=qt6-base
 _qtver=6.2.2
 pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=3
 arch=(x86_64)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
@@ -28,7 +28,7 @@
         qt6-base-cflags.patch
         qt6-base-nostrip.patch)
 sha256sums=('85ab9180180c2eaf84cd11ae4c6d5a6a69f2f8fd7260aaccfd91a3e7e7232c1a'
-            'cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c'
+            '5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78'
             '4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094')
 
 prepare() {
@@ -50,7 +50,8 @@
     -DINSTALL_EXAMPLESDIR=share/doc/qt6/examples \
     -DQT_FEATURE_journald=ON \
     -DQT_FEATURE_openssl_linked=ON \
-    -DQT_FEATURE_system_sqlite=ON
+    -DQT_FEATURE_system_sqlite=ON \
+    -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
   cmake --build build
 }
 

Modified: qt6-base-cflags.patch
===================================================================
--- qt6-base-cflags.patch	2021-12-21 21:14:34 UTC (rev 432890)
+++ qt6-base-cflags.patch	2021-12-21 21:36:11 UTC (rev 432891)
@@ -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