Arm build fix

This commit is contained in:
Martin Stransky 2014-10-15 08:46:44 +02:00
parent 0979a72b3a
commit c80bede1f9
2 changed files with 26 additions and 0 deletions

View File

@ -113,6 +113,7 @@ Source24: mozilla-api-key
Patch0: firefox-install-dir.patch Patch0: firefox-install-dir.patch
Patch1: firefox-build.patch Patch1: firefox-build.patch
Patch3: mozilla-build-arm.patch Patch3: mozilla-build-arm.patch
Patch4: mozilla-build-arm-webrtc.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=814879#c3 # https://bugzilla.redhat.com/show_bug.cgi?id=814879#c3
Patch18: xulrunner-24.0-jemalloc-ppc.patch Patch18: xulrunner-24.0-jemalloc-ppc.patch
# workaround linking issue on s390 (JSContext::updateMallocCounter(size_t) not found) # workaround linking issue on s390 (JSContext::updateMallocCounter(size_t) not found)
@ -248,7 +249,9 @@ cd %{tarballdir}
%ifarch %{arm} %ifarch %{arm}
%patch3 -p2 -b .arm %patch3 -p2 -b .arm
%patch4 -p2 -b .arm
%endif %endif
%patch18 -p2 -b .jemalloc-ppc %patch18 -p2 -b .jemalloc-ppc
%patch19 -p2 -b .s390-inlines %patch19 -p2 -b .s390-inlines
%patch20 -p1 -b .prbool %patch20 -p1 -b .prbool

View File

@ -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': [