summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Stransky <stransky@anakreon.cz>2014-10-15 08:46:44 +0200
committerMartin Stransky <stransky@anakreon.cz>2014-10-15 08:46:44 +0200
commitc80bede1f9d1ac366a6c89f79cb5f014fb64e3c0 (patch)
tree0abdc717f7211de4eaaa4799cc4f134be9d3f5e7
parentbuild fix - missng header for PRBool (diff)
downloadlibrewolf-fedora-ff-c80bede1f9d1ac366a6c89f79cb5f014fb64e3c0.tar.gz
librewolf-fedora-ff-c80bede1f9d1ac366a6c89f79cb5f014fb64e3c0.tar.bz2
librewolf-fedora-ff-c80bede1f9d1ac366a6c89f79cb5f014fb64e3c0.zip
Arm build fix
-rw-r--r--firefox.spec3
-rw-r--r--mozilla-build-arm-webrtc.patch23
2 files changed, 26 insertions, 0 deletions
diff --git a/firefox.spec b/firefox.spec
index 98c9654..46e869d 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -113,6 +113,7 @@ Source24: mozilla-api-key
Patch0: firefox-install-dir.patch
Patch1: firefox-build.patch
Patch3: mozilla-build-arm.patch
+Patch4: mozilla-build-arm-webrtc.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=814879#c3
Patch18: xulrunner-24.0-jemalloc-ppc.patch
# workaround linking issue on s390 (JSContext::updateMallocCounter(size_t) not found)
@@ -248,7 +249,9 @@ cd %{tarballdir}
%ifarch %{arm}
%patch3 -p2 -b .arm
+%patch4 -p2 -b .arm
%endif
+
%patch18 -p2 -b .jemalloc-ppc
%patch19 -p2 -b .s390-inlines
%patch20 -p1 -b .prbool
diff --git a/mozilla-build-arm-webrtc.patch b/mozilla-build-arm-webrtc.patch
new file mode 100644
index 0000000..ce3f20c
--- /dev/null
+++ b/mozilla-build-arm-webrtc.patch
@@ -0,0 +1,23 @@
+diff -up firefox-33.0/mozilla-release/media/webrtc/trunk/webrtc/build/common.gypi.old firefox-33.0/mozilla-release/media/webrtc/trunk/webrtc/build/common.gypi
+--- firefox-33.0/mozilla-release/media/webrtc/trunk/webrtc/build/common.gypi.old 2014-10-11 11:06:40.000000000 +0200
++++ firefox-33.0/mozilla-release/media/webrtc/trunk/webrtc/build/common.gypi 2014-10-15 08:43:34.746223846 +0200
+@@ -235,19 +235,6 @@
+ 'defines': [
+ 'WEBRTC_ARCH_ARM',
+ ],
+- 'conditions': [
+- ['arm_version==7', {
+- 'defines': ['WEBRTC_ARCH_ARM_V7',
+- 'WEBRTC_BUILD_NEON_LIBS'],
+- 'conditions': [
+- ['arm_neon==1', {
+- 'defines': ['WEBRTC_ARCH_ARM_NEON',],
+- }, {
+- 'defines': ['WEBRTC_DETECT_ARM_NEON',],
+- }],
+- ],
+- }],
+- ],
+ }],
+ ['os_bsd==1', {
+ 'defines': [
bgstack15