Fix FTBFS on ARM: linux-pri patch: Set use_system_yasm only on x86_64 and i386

epel9
Kevin Kofler 9 years ago
parent bf16304ee3
commit dda9dc45a8

@ -302,7 +302,7 @@ popd
%changelog
* Sat Jan 09 2016 Kevin Kofler <Kevin@tigcc.ticalc.org> - 5.6.0-0.5.beta
- Bump Release for official Rawhide build (to distinguish it from Copr builds)
- Fix FTBFS on ARM: linux-pri patch: Set use_system_yasm only on x86_64 and i386
* Sat Jan 09 2016 Kevin Kofler <Kevin@tigcc.ticalc.org> - 5.6.0-0.4.beta.1
- Use more specific BuildRequires for docs (thanks to rdieter)

@ -1,17 +1,22 @@
diff -ur qtwebengine-opensource-src-5.6.0-beta/src/core/config/linux.pri qtwebengine-opensource-src-5.6.0-beta-linux-pri/src/core/config/linux.pri
--- qtwebengine-opensource-src-5.6.0-beta/src/core/config/linux.pri 2015-12-14 16:27:24.000000000 +0100
+++ qtwebengine-opensource-src-5.6.0-beta-linux-pri/src/core/config/linux.pri 2016-01-06 04:43:23.115923478 +0100
@@ -43,3 +43,20 @@
@@ -43,3 +43,25 @@
use?(system_icu): GYP_CONFIG += use_system_icu=1
use?(system_ffmpeg): GYP_CONFIG += use_system_ffmpeg=1
+# some more system packages, that are not checked for for some reason
+GYP_CONFIG += \
+ use_system_yasm=1 \
+ use_system_expat=1 \
+ use_system_re2=1 \
+ use_system_protobuf=1
+
+# yasm is only used on x86, and passing use_system_yasm makes the build fail on
+# other architectures (e.g., ARM), so make it conditional on the architecture
+contains(QT_ARCH, "x86_64")|contains(QT_ARCH, "i386") {
+ GYP_CONFIG += use_system_yasm=1
+}
+
+# link libpci instead of dlopening it, our Qt packaging depends on it anyway
+GYP_CONFIG += linux_link_libpci=1
+
Loading…
Cancel
Save