Attachment 936138 Details for Bug 1140159 – patch split

[patch] patch split

0001-Fixed-build-on-s390-x-and-ppc64le.patch (text/plain), 3.23 KB, created by Jakub Čajka on 2014-09-10 13:19:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jakub Čajka

Created: 2014-09-10 13:19:24 UTC

Size: 3.23 KB

patch

obsolete

>From c98f06cae2d78059be21bfaf52be5a9585dab39d Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Jakub=20=C4=8Cajka?= <jcajka@redhat.com>
>Date: Wed, 10 Sep 2014 15:15:56 +0200
>Subject: [PATCH] Fixed build on s390(x) and ppc64le
>
>---
> ppc64le-build-fix.patch | 12 ++++++++++++
> s390-build-fix.patch    | 17 +++++++++++++++++
> xulrunner.spec          |  9 ++++++++-
> 3 files changed, 37 insertions(+), 1 deletion(-)
> create mode 100644 ppc64le-build-fix.patch
> create mode 100644 s390-build-fix.patch
>
>diff --git a/ppc64le-build-fix.patch b/ppc64le-build-fix.patch
>new file mode 100644
>index 0000000..af8eb4a
>--- /dev/null
>+++ b/ppc64le-build-fix.patch
>@@ -0,0 +1,12 @@
>+diff -up firefox-32.0/mozilla-release/js/src/configure.in.ppc64le firefox-32.0/mozilla-release/js/src/configure.in
>+--- firefox-32.0/mozilla-release/js/src/configure.in.ppc64le	2014-09-10 14:17:21.408378683 +0200
>++++ firefox-32.0/mozilla-release/js/src/configure.in	2014-09-09 16:13:47.891067039 +0200
>+@@ -2005,7 +2005,7 @@ dnl ENABLE_ION=0
>+     AC_DEFINE(JS_PUNBOX64)
>+     fi
>+     ;;
>+-powerpc64-*)
>++powerpc64*)
>+     AC_DEFINE(JS_CPU_PPC64)
>+     AC_DEFINE(JS_PUNBOX64)
>+     ;;
>diff --git a/s390-build-fix.patch b/s390-build-fix.patch
>new file mode 100644
>index 0000000..c647088
>--- /dev/null
>+++ b/s390-build-fix.patch
>@@ -0,0 +1,17 @@
>+diff -up firefox-32.0/mozilla-release/js/src/configure.in.s390 firefox-32.0/mozilla-release/js/src/configure.in
>+--- firefox-32.0/mozilla-release/js/src/configure.in.s390	2014-09-10 14:19:32.038787879 +0200
>++++ firefox-32.0/mozilla-release/js/src/configure.in	2014-09-09 16:13:47.891067039 +0200
>+@@ -2017,6 +2017,13 @@ mips*-*)
>+     AC_DEFINE(JS_CPU_MIPS)
>+     AC_DEFINE(JS_NUNBOX32)
>+     ;;
>++s390x*)
>++    AC_DEFINE(JS_CPU_S390X)
>++    AC_DEFINE(JS_PUNBOX64)
>++    ;;
>++s390*)
>++    AC_DEFINE(JS_CPU_S390)
>++    AC_DEFINE(JS_NUNBOX32)
>+ esac
>+ 
>+ MOZ_ARG_DISABLE_BOOL(ion,
>diff --git a/xulrunner.spec b/xulrunner.spec
>index 572071d..c20c241 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
>@@ -91,6 +91,8 @@ Source21:       %{name}.sh.in
> Patch1:         xulrunner-install-dir.patch
> Patch2:         firefox-build.patch
> Patch3:         mozilla-build-arm.patch
>+Patch4:         s390-build-fix.patch
>+Patch5:         ppc64le-build-fix.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)
>@@ -232,6 +234,8 @@ cd %{tarballdir}
> %patch1  -p1
> %patch2  -p2 -b .build
> %patch3  -p2 -b .arm
>+%patch4  -p2 -b .s390
>+%patch5  -p2 -b .ppc64le
> %patch18 -p2 -b .jemalloc-ppc
> %patch19 -p2 -b .s390-inlines
> 
>@@ -531,6 +535,9 @@ fi
> #---------------------------------------------------------------------
> 
> %changelog
>+* Wed Sep 10 2014 Jakub Äajka <jcajka@redhat.com> - 32.0-2
>+- Fixed build on s390(x) and ppc64le
>+
> * Tue Aug 26 2014 Martin Stransky <stransky@redhat.com> - 32.0-1
> - Update to 32.0 build 1
> 
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1140159: 936115 | 936138