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

[Antonio Rojas]

    Date: Monday, March 30, 2020 @ 10:26:54
  Author: arojas
Revision: 378709

qmake: honor CPPFLAGS, distinguish between CFLAGS and CXXFLAGS

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-30 10:10:13 UTC (rev 378708)
+++ PKGBUILD	2020-03-30 10:26:54 UTC (rev 378709)
@@ -5,7 +5,7 @@
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.14.1
 pkgver=${_qtver/-/}
-pkgrel=3
+pkgrel=4
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -31,7 +31,7 @@
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
          qt5-base-cflags.patch)
 sha256sums=('d9d423a6e7bcf1055c0372fc029f14a6fe67dd62c67b83095cde68b60b762cf7'
-            'c70640499637314df68cc7a56519f0bf8b65dd808dd982c96c6f045bba993adf')
+            '6912a6485eac657afe6dc227d5f7dbf32dfeca6eb2674929bc291ba26e329efb')
 
 prepare() {
   cd ${_pkgfqn}

Modified: qt5-base-cflags.patch
===================================================================
--- qt5-base-cflags.patch	2020-03-30 10:10:13 UTC (rev 378708)
+++ qt5-base-cflags.patch	2020-03-30 10:26:54 UTC (rev 378709)
@@ -1,5 +1,5 @@
 diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..79f2d2fff9 100644
+index a493cd5984..e0b30df4f5 100644
 --- a/mkspecs/common/g++-unix.conf
 +++ b/mkspecs/common/g++-unix.conf
 @@ -10,5 +10,5 @@
@@ -10,17 +10,32 @@
 +eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS))
  QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
 diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 4d82321cba..4a61fc9d25 100644
+index 1f919d270a..156686b391 100644
 --- a/mkspecs/common/gcc-base.conf
 +++ b/mkspecs/common/gcc-base.conf
-@@ -40,8 +40,8 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
+@@ -40,9 +40,9 @@ 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
-+eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS))
-+eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS))
- QMAKE_CFLAGS_DEBUG         += -g
+-QMAKE_CFLAGS_DEBUG         += -g
++eval(QMAKE_CFLAGS_RELEASE += $$(CPPFLAGS) $$(CFLAGS))
++eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CFLAGS))
++eval(QMAKE_CFLAGS_DEBUG         += $$(DEBUG_CFLAGS))
  QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
  QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
+ QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
+@@ -59,9 +59,9 @@ 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
++eval(QMAKE_CXXFLAGS_RELEASE += $$(CPPFLAGS) $$(CXXFLAGS))
++eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CXXFLAGS))
++eval(QMAKE_CXXFLAGS_DEBUG         += $$(DEBUG_CXXFLAGS))
+ QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
+ QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
+ QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP