[xulrunner] fix build on AArch64
Lubomir Rintel
lkundrak at fedoraproject.org
Thu Sep 18 10:01:26 UTC 2014
commit 7f9652e14cbf01a301ac6af8f3269a0d2f84b80f
Author: Marcin Juszkiewicz <mjuszkiewicz at redhat.com>
Date: Mon Sep 8 15:44:54 2014 +0200
fix build on AArch64
Signed-off-by: Marcin Juszkiewicz <mjuszkiewicz at redhat.com>
xulrunner-fix-aarch64.patch | 22 ++++++++++++++++++++++
xulrunner.spec | 8 +++++++-
2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/xulrunner-fix-aarch64.patch b/xulrunner-fix-aarch64.patch
new file mode 100644
index 0000000..e153160
--- /dev/null
+++ b/xulrunner-fix-aarch64.patch
@@ -0,0 +1,22 @@
+Author: Marcin Juszkiewicz <mjuszkiewicz at redhat.com>
+
+JS_PUNBOX64 needs to be defined for 64-bit targets.
+
+Upstream HEAD defines it for all 64-bit machines so no forward porting
+should be needed.
+
+Index: mozilla-release/js/src/configure.in
+===================================================================
+--- mozilla-release.orig/js/src/configure.in
++++ mozilla-release/js/src/configure.in
+@@ -2017,6 +2017,10 @@ mips*-*)
+ AC_DEFINE(JS_CPU_MIPS)
+ AC_DEFINE(JS_NUNBOX32)
+ ;;
++aarch64*)
++ AC_DEFINE(JS_CPU_AARCH64)
++ AC_DEFINE(JS_PUNBOX64)
++ ;;
+ esac
+
+ MOZ_ARG_DISABLE_BOOL(ion,
diff --git a/xulrunner.spec b/xulrunner.spec
index d8ace62..954cf76 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -78,7 +78,7 @@
Summary: XUL Runtime for Gecko Applications
Name: xulrunner
Version: 32.0
-Release: 2%{?pre_tag}%{?dist}
+Release: 3%{?pre_tag}%{?dist}
URL: http://developer.mozilla.org/En/XULRunner
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@@ -103,6 +103,8 @@ Patch200: mozilla-193-pkgconfig.patch
# Unable to install addons from https pages
Patch204: rhbz-966424.patch
+# Let it build on AArch64 with simple backport like patch
+Patch210: xulrunner-fix-aarch64.patch
# Upstream patches
# ---------------------------------------------------
@@ -240,6 +242,7 @@ cd %{tarballdir}
%patch200 -p2 -b .pk
%patch204 -p1 -b .966424
+%patch210 -p1
# Upstream patches
@@ -541,6 +544,9 @@ fi
#---------------------------------------------------------------------
%changelog
+* Mon Sep 08 2014 Marcin Juszkiewicz <mjuszkiewicz at redhat.com> - 32.0-3
+- Fix build on AArch64
+
* Tue Sep 9 2014 Martin Stransky <stransky at redhat.com> - 32.0-2
- move /sdk/bin to xulrunner libdir
More information about the scm-commits
mailing list