Rebase extractcflag patch
Not sure if it's needed, it seems to build anyway
This commit is contained in:
parent
0648d785ca
commit
65c9f227b2
@ -73,7 +73,7 @@ Patch0: qtwebengine-everywhere-src-5.10.0-linux-pri.patch
|
|||||||
Patch1: qtwebengine-everywhere-src-5.11.0-no-icudtl-dat.patch
|
Patch1: qtwebengine-everywhere-src-5.11.0-no-icudtl-dat.patch
|
||||||
# fix extractCFlag to also look in QMAKE_CFLAGS_RELEASE, needed to detect the
|
# 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
|
# ARM flags with our %%qmake_qt5 macro, including for the next patch
|
||||||
Patch2: qtwebengine-opensource-src-5.12.1-fix-extractcflag.patch
|
Patch2: qtwebengine-opensource-src-5.12.4-fix-extractcflag.patch
|
||||||
# disable NEON vector instructions on ARM where the NEON code FTBFS due to
|
# disable NEON vector instructions on ARM where the NEON code FTBFS due to
|
||||||
# GCC bug https://bugzilla.redhat.com/show_bug.cgi?id=1282495
|
# GCC bug https://bugzilla.redhat.com/show_bug.cgi?id=1282495
|
||||||
Patch3: qtwebengine-opensource-src-5.9.0-no-neon.patch
|
Patch3: qtwebengine-opensource-src-5.9.0-no-neon.patch
|
||||||
@ -341,8 +341,7 @@ BuildArch: noarch
|
|||||||
%setup -q -n %{qt_module}-everywhere-src-%{version}%{?prerelease:-%{prerelease}}
|
%setup -q -n %{qt_module}-everywhere-src-%{version}%{?prerelease:-%{prerelease}}
|
||||||
%patch0 -p1 -b .linux-pri
|
%patch0 -p1 -b .linux-pri
|
||||||
%patch1 -p1 -b .no-icudtl-dat
|
%patch1 -p1 -b .no-icudtl-dat
|
||||||
## FIXME? no longer applies, relevant code very different now, hopefuly no longer needed -- rex
|
%patch2 -p1 -b .fix-extractcflag
|
||||||
#patch2 -p1 -b .fix-extractcflag
|
|
||||||
%if !0%{?arm_neon}
|
%if !0%{?arm_neon}
|
||||||
%patch3 -p1 -b .no-neon
|
%patch3 -p1 -b .no-neon
|
||||||
%endif
|
%endif
|
||||||
|
@ -1,12 +0,0 @@
|
|||||||
diff -up qtwebengine-everywhere-src-5.12.1/mkspecs/features/functions.prf.fix-extractcflag qtwebengine-everywhere-src-5.12.1/mkspecs/features/functions.prf
|
|
||||||
--- qtwebengine-everywhere-src-5.12.1/mkspecs/features/functions.prf.fix-extractcflag 2019-02-01 09:25:44.950965875 -0600
|
|
||||||
+++ qtwebengine-everywhere-src-5.12.1/mkspecs/features/functions.prf 2019-02-01 09:28:39.290041131 -0600
|
|
||||||
@@ -11,7 +11,7 @@ defineReplace(getChromiumSrcDir) {
|
|
||||||
}
|
|
||||||
|
|
||||||
defineReplace(extractCFlag) {
|
|
||||||
- CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS
|
|
||||||
+ CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS $$QMAKE_CFLAGS_RELEASE
|
|
||||||
OPTION = $$find(CFLAGS, $$1)
|
|
||||||
OPTION = $$split(OPTION, =)
|
|
||||||
PARAM = $$member(OPTION, 1)
|
|
11
qtwebengine-opensource-src-5.12.4-fix-extractcflag.patch
Normal file
11
qtwebengine-opensource-src-5.12.4-fix-extractcflag.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
diff --git a/src/core/config/functions.pri b/src/core/config/functions.pri
|
||||||
|
index 8c11faa16..191d3d623 100644
|
||||||
|
--- a/src/core/config/functions.pri
|
||||||
|
+++ b/src/core/config/functions.pri
|
||||||
|
@@ -1,5 +1,5 @@
|
||||||
|
defineReplace(qtwebengine_extractCFlag) {
|
||||||
|
- CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS
|
||||||
|
+ CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS $$QMAKE_CFLAGS_RELEASE
|
||||||
|
OPTION = $$find(CFLAGS, $$1)
|
||||||
|
OPTION = $$split(OPTION, =)
|
||||||
|
PARAM = $$member(OPTION, 1)
|
Loading…
Reference in New Issue
Block a user