[xulrunner] Arm build fix

Martin Stransky stransky at fedoraproject.org
Mon Sep 16 09:31:02 UTC 2013


commit 8d501e5c5ef503123eae825331a06762e0daf9bf
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Mon Sep 16 11:30:44 2013 +0200

    Arm build fix

 mozilla-build-arm.patch |   12 ++++++++++++
 xulrunner.spec          |    7 ++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/mozilla-build-arm.patch b/mozilla-build-arm.patch
new file mode 100644
index 0000000..6e27f78
--- /dev/null
+++ b/mozilla-build-arm.patch
@@ -0,0 +1,12 @@
+diff -up xulrunner-24.0/mozilla-release/gfx/ycbcr/moz.build.neon xulrunner-24.0/mozilla-release/gfx/ycbcr/moz.build
+--- xulrunner-24.0/mozilla-release/gfx/ycbcr/moz.build.neon	2013-09-11 01:15:02.000000000 +0200
++++ xulrunner-24.0/mozilla-release/gfx/ycbcr/moz.build	2013-09-16 11:23:40.487028288 +0200
+@@ -61,7 +61,7 @@ else:
+         'yuv_row_other.cpp',
+     ]
+ 
+-if CONFIG['OS_TEST'] == 'arm' and CONFIG['HAVE_ARM_NEON']:
++if CONFIG['HAVE_ARM_NEON']:
+     CPP_SOURCES += [
+         'yuv_convert_arm.cpp',
+     ]
diff --git a/xulrunner.spec b/xulrunner.spec
index f3831d1..5d66b79 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -78,7 +78,7 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        24.0
-Release:        1%{?pre_tag}%{?dist}
+Release:        2%{?pre_tag}%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -90,6 +90,7 @@ Source21:       %{name}.sh.in
 # build patches
 Patch1:         xulrunner-install-dir.patch
 Patch2:         mozilla-build.patch
+Patch3:         mozilla-build-arm.patch
 Patch14:        xulrunner-2.0-chromium-types.patch
 Patch17:        xulrunner-24.0-gcc47.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=814879#c3
@@ -232,6 +233,7 @@ cd %{tarballdir}
 
 %patch1  -p1
 %patch2  -p1 -b .build
+%patch3  -p2 -b .arm
 %patch14 -p2 -b .chromium-types
 %patch17 -p2 -b .gcc47
 %patch18 -p2 -b .jemalloc-ppc
@@ -525,6 +527,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Sep 16 2013 Martin Stransky <stransky at redhat.com> - 24.0.1-2
+- Arm build fix
+
 * Fri Sep 13 2013 Martin Stransky <stransky at redhat.com> - 24.0.1-1
 - Update to 24.0
 


More information about the scm-commits mailing list