From cdac6a712b9930e4ff39db5bcd9ff132298a4e8a Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Sun, 10 Jan 2016 18:18:58 +0100 Subject: [PATCH] Fix extractCFlag to also look in QMAKE_CFLAGS_RELEASE (needed for ARM) --- qt5-qtwebengine.spec | 9 +++++++-- ...-opensource-src-5.6.0-beta-fix-extractcflag.patch | 12 ++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 qtwebengine-opensource-src-5.6.0-beta-fix-extractcflag.patch diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index 2bf2adc..d748663 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -36,9 +36,12 @@ Patch0: qtwebengine-opensource-src-5.6.0-beta-no-format.patch Patch1: qtwebengine-opensource-src-5.6.0-beta-linux-pri.patch # don't require the time zone detection API backported from ICU 55 (thanks spot) Patch2: qtwebengine-opensource-src-5.6.0-beta-system-icu54.patch +# fix extractCFlag to also look in QMAKE_CFLAGS_RELEASE, needed to detect the +# ARM flags with our %%qmake_qt5 macro, including for the next patch +Patch3: qtwebengine-opensource-src-5.6.0-beta-fix-extractcflag.patch # disable NEON vector instructions on ARM for now, the NEON code FTBFS due to # GCC bug https://bugzilla.redhat.com/show_bug.cgi?id=1282495 -Patch3: qtwebengine-opensource-src-5.6.0-beta-no-neon.patch +Patch4: qtwebengine-opensource-src-5.6.0-beta-no-neon.patch BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: qt5-qtdeclarative-devel >= %{version} @@ -235,7 +238,8 @@ BuildArch: noarch %patch0 -p1 -b .no-format %patch1 -p1 -b .linux-pri %patch2 -p1 -b .system-icu54 -%patch3 -p1 -b .no-neon +%patch3 -p1 -b .fix-extractcflag +%patch4 -p1 -b .no-neon %build export STRIP=strip @@ -308,6 +312,7 @@ popd * Sat Jan 09 2016 Kevin Kofler - 5.6.0-0.5.beta - Fix FTBFS on ARM: linux-pri patch: Set use_system_yasm only on x86_64 and i386 - Fix FTBFS on ARM: Respin tarball with: clean_ffmpeg.sh: Add missing ARM files +- Fix extractCFlag to also look in QMAKE_CFLAGS_RELEASE (needed for ARM) - Fix FTBFS on ARM: Disable NEON due to #1282495 (GCC bug) * Sat Jan 09 2016 Kevin Kofler - 5.6.0-0.4.beta.1 diff --git a/qtwebengine-opensource-src-5.6.0-beta-fix-extractcflag.patch b/qtwebengine-opensource-src-5.6.0-beta-fix-extractcflag.patch new file mode 100644 index 0000000..8beae69 --- /dev/null +++ b/qtwebengine-opensource-src-5.6.0-beta-fix-extractcflag.patch @@ -0,0 +1,12 @@ +diff -ur qtwebengine-opensource-src-5.6.0-beta/tools/qmake/mkspecs/features/functions.prf qtwebengine-opensource-src-5.6.0-beta-fix-extractcflag/tools/qmake/mkspecs/features/functions.prf +--- qtwebengine-opensource-src-5.6.0-beta/tools/qmake/mkspecs/features/functions.prf 2015-12-14 16:27:24.000000000 +0100 ++++ qtwebengine-opensource-src-5.6.0-beta-fix-extractcflag/tools/qmake/mkspecs/features/functions.prf 2016-01-10 18:15:23.942032985 +0100 +@@ -87,7 +87,7 @@ + } + + defineReplace(extractCFlag) { +- CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS ++ CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS $$QMAKE_CFLAGS_RELEASE + OPTION = $$find(CFLAGS, $$1) + OPTION = $$split(OPTION, =) + return ($$member(OPTION, 1))