git » qt5-base.git » commit f9fe989

Import CFLAGS in a way that doesn't break qtwebengine build. Disable -optimized-qmake, since the qmake build system interprets the env variables in gcc-base wrongly

author Antonio Rojas
2020-03-06 07:11:51 UTC
committer Antonio Rojas
2020-03-06 07:11:51 UTC
parent 645672c4cfeb5893a31a139b60b6838aef5ae7ba
Import CFLAGS in a way that doesn't break qtwebengine build. Disable -optimized-qmake, since the qmake build system interprets the env variables in gcc-base wrongly
PKGBUILD +2 -3
qt5-base-cflags.patch +7 -5 
diff --git a/PKGBUILD b/PKGBUILD
index ad085d8..6241629 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=qt5-base
 pkgname=(qt5-base qt5-xcb-private-headers)
 _qtver=5.14.1
 pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -31,7 +31,7 @@ _pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
          qt5-base-cflags.patch)
 sha256sums=('d9d423a6e7bcf1055c0372fc029f14a6fe67dd62c67b83095cde68b60b762cf7'
-            '3d6524381b2bbd35c9d85fe6d9f3e39be645e12658a810604dfe981633f78d8b')
+            '7cbf56fd6076f0c193f06715d1dfdae61905504cb01bd907ac33cc487f48d8c6')
 
 prepare() {
   cd ${_pkgfqn}
@@ -55,7 +55,6 @@ build() {
     -openssl-linked \
     -nomake examples \
     -no-rpath \
-    -optimized-qmake \
     -dbus-linked \
     -system-harfbuzz \
     -journald \
diff --git a/qt5-base-cflags.patch b/qt5-base-cflags.patch
index ca18909..d5be0c0 100644
--- a/qt5-base-cflags.patch
+++ b/qt5-base-cflags.patch
@@ -2,25 +2,27 @@ diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
 index a493cd5984..79f2d2fff9 100644
 --- a/mkspecs/common/g++-unix.conf
 +++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,5 @@
+@@ -10,5 +10,6 @@
  
  include(g++-base.conf)
  
 -QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+QMAKE_LFLAGS_RELEASE   += $$(LDFLAGS)
++ENV_LDFLAGS = $$(LDFLAGS)
++QMAKE_LFLAGS_RELEASE   += $$split(ENV_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
 --- a/mkspecs/common/gcc-base.conf
 +++ b/mkspecs/common/gcc-base.conf
-@@ -40,8 +40,8 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
+@@ -40,8 +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
-+QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE $$(CFLAGS)
-+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g $$(CFLAGS)
++ENV_CFLAGS = $$(CFLAGS)
++QMAKE_CFLAGS_RELEASE       += $$split(ENV_CFLAGS, " ")
++QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$split(ENV_CFLAGS, " ")
  QMAKE_CFLAGS_DEBUG         += -g
  QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
  QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC