Attachment 935365 Details for Bug 1139279 – patch + spec changeset

patch + spec changeset

0001-fix-build-on-AArch64.patch (text/plain), 2.43 KB, created by Marcin Juszkiewicz on 2014-09-08 14:20:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcin Juszkiewicz

Created: 2014-09-08 14:20:46 UTC

Size: 2.43 KB

patch

obsolete

>From cfb0a511062ae3eece1747c18799ee29f8e947eb Mon Sep 17 00:00:00 2001
>From: Marcin Juszkiewicz <mjuszkiewicz@redhat.com>
>Date: Mon, 8 Sep 2014 15:44:54 +0200
>Subject: [PATCH] fix build on AArch64
>
>Signed-off-by: Marcin Juszkiewicz <mjuszkiewicz@redhat.com>
>---
> xulrunner-fix-aarch64.patch | 22 ++++++++++++++++++++++
> xulrunner.spec              |  8 +++++++-
> 2 files changed, 29 insertions(+), 1 deletion(-)
> create mode 100644 xulrunner-fix-aarch64.patch
>
>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@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 572071d..c406797 100644
>--- a/xulrunner.spec
>+++ b/xulrunner.spec
>@@ -78,7 +78,7 @@
> Summary:        XUL Runtime for Gecko Applications
> Name:           xulrunner
> Version:        32.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
>@@ -101,6 +101,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
> 
> # ---------------------------------------------------
>@@ -237,6 +239,7 @@ cd %{tarballdir}
> 
> %patch200 -p2 -b .pk
> %patch204 -p1 -b .966424
>+%patch210 -p1
> 
> # Upstream patches
> 
>@@ -531,6 +534,9 @@ fi
> #---------------------------------------------------------------------
> 
> %changelog
>+* Mon Sep 08 2014 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> - 32.0-2
>+- Fix build on AArch64
>+
> * Tue Aug 26 2014 Martin Stransky <stransky@redhat.com> - 32.0-1
> - Update to 32.0 build 1
> 
>-- 
>2.1.0
>

Actions: View

Attachments on bug 1139279: 935365