Attachment 936114 Details for Bug 1140157 – Proposed solution

[patch] Proposed solution

0001-fixed-s390-x-and-ppc64le-build.patch (text/plain), 2.82 KB, created by Jakub Čajka on 2014-09-10 11:43:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jakub Čajka

Created: 2014-09-10 11:43:18 UTC

Size: 2.82 KB

patch

obsolete

>From 76c0a40b4fa988a0a025babd4b211118de9a1a1d Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Jakub=20=C4=8Cajka?= <jcajka@redhat.com>
>Date: Wed, 10 Sep 2014 13:21:45 +0200
>Subject: [PATCH] fixed s390(x) and ppc64le build
>
>---
> firefox.spec             |  8 +++++++-
> sec-arch-build-fix.patch | 26 ++++++++++++++++++++++++++
> 2 files changed, 33 insertions(+), 1 deletion(-)
> create mode 100644 sec-arch-build-fix.patch
>
>diff --git a/firefox.spec b/firefox.spec
>index 5fa798a..8a5c3f3 100644
>--- a/firefox.spec
>+++ b/firefox.spec
>@@ -87,7 +87,7 @@
> Summary:        Mozilla Firefox Web browser
> Name:           firefox
> Version:        32.0
>-Release:        1%{?pre_tag}%{?dist}
>+Release:        2%{?pre_tag}%{?dist}
> URL:            http://www.mozilla.org/projects/firefox/
> License:        MPLv1.1 or GPLv2+ or LGPLv2+
> Group:          Applications/Internet
>@@ -106,6 +106,7 @@ Source23:       firefox.1
> Patch0:         firefox-install-dir.patch
> Patch1:         firefox-build.patch
> Patch3:         mozilla-build-arm.patch
>+Patch4:         sec-arch-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)
>@@ -221,6 +222,7 @@ cd %{tarballdir}
> %ifarch %{arm}
> %patch3  -p2 -b .arm
> %endif
>+%patch4 -p2 -b .s390
> %patch18 -p2 -b .jemalloc-ppc
> %patch19 -p2 -b .s390-inlines
> 
>@@ -234,6 +236,7 @@ cd %{tarballdir}
> # Upstream patches
> %patch300 -p1 -b .858919
> 
>+
> %if %{official_branding}
> # Required by Mozilla Corporation
> 
>@@ -643,6 +646,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
> #---------------------------------------------------------------------
> 
> %changelog
>+* Tue Sep 09 2014 Jakub Äajka <jcajka@redhat.com> - 32.0-2
>+- fixed s390(x) and ppc64le build
>+
> * Tue Aug 26 2014 Martin Stransky <stransky@redhat.com> - 32.0-1
> - Update to 32.0 build 1
> 
>diff --git a/sec-arch-build-fix.patch b/sec-arch-build-fix.patch
>new file mode 100644
>index 0000000..7c33ead
>--- /dev/null
>+++ b/sec-arch-build-fix.patch
>@@ -0,0 +1,26 @@
>+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-08-26 05:37:57.000000000 +0200
>++++ firefox-32.0/mozilla-release/js/src/configure.in	2014-09-09 16:11:01.837542125 +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)
>+     ;;
>+@@ -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,
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1140157: 936114 | 936137 | 936971