--- a/MozillaFirefox/MozillaFirefox.changes Wed Nov 09 13:07:30 2011 +0100
+++ b/MozillaFirefox/MozillaFirefox.changes Sat Nov 12 16:22:36 2011 +0100
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Nov 12 15:16:38 UTC 2011 - dvaleev@suse.com
+
+- fix ppc64 build
+
-------------------------------------------------------------------
Sun Nov 6 08:20:59 UTC 2011 - wr@rosenauer.org
--- a/MozillaFirefox/MozillaFirefox.spec Wed Nov 09 13:07:30 2011 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec Sat Nov 12 16:22:36 2011 +0100
@@ -73,6 +73,7 @@
Patch10: mozilla-dump_syms-static.patch
Patch11: mozilla-sle11.patch
Patch12: mozilla-linux3.patch
+Patch13: mozilla-ppc64.patch
# Firefox/browser
Patch31: firefox-browser-css.patch
Patch32: firefox-cross-desktop.patch
@@ -204,6 +205,7 @@
%patch11 -p1
%endif
%patch12 -p1
+%patch13 -p1
#
%patch31 -p1
%patch32 -p1
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/MozillaFirefox/mozilla-ppc64.patch Sat Nov 12 16:22:36 2011 +0100
@@ -0,0 +1,1 @@
+../mozilla-ppc64.patch
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mozilla-ppc64.patch Sat Nov 12 16:22:36 2011 +0100
@@ -0,0 +1,75 @@
+# HG changeset patch
+# Parent 87e43d08cce58b76e1910946c36c6465bb4c74e6
+From: upstream
+Subject: Fix PPC64 build
+https://bugzilla.mozilla.org/show_bug.cgi?id=670719
+https://bugzilla.mozilla.org/show_bug.cgi?id=654056
+
+diff --git a/ipc/chromium/src/build/build_config.h b/ipc/chromium/src/build/build_config.h
+--- a/ipc/chromium/src/build/build_config.h
++++ b/ipc/chromium/src/build/build_config.h
+@@ -52,16 +52,19 @@
+ #define ARCH_CPU_X86_FAMILY 1
+ #define ARCH_CPU_X86 1
+ #define ARCH_CPU_32_BITS 1
+ #elif defined(__ARMEL__)
+ #define ARCH_CPU_ARM_FAMILY 1
+ #define ARCH_CPU_ARMEL 1
+ #define ARCH_CPU_32_BITS 1
+ #define WCHAR_T_IS_UNSIGNED 1
++#elif defined(__powerpc64__)
++#define ARCH_CPU_PPC64 1
++#define ARCH_CPU_64_BITS 1
+ #elif defined(__ppc__) || defined(__powerpc__)
+ #define ARCH_CPU_PPC 1
+ #define ARCH_CPU_32_BITS 1
+ #else
+ #error Please add support for your architecture in build/build_config.h
+ #endif
+
+ // Type detection for wchar_t.
+diff --git a/js/src/Makefile.in b/js/src/Makefile.in
+--- a/js/src/Makefile.in
++++ b/js/src/Makefile.in
+@@ -433,16 +433,18 @@ CPPSRCS += \
+ YarrPattern.cpp \
+ YarrSyntaxChecker.cpp \
+ $(NULL)
+ else
+
+ ###############################################
+ # BEGIN include sources for the Nitro assembler
+ #
++ENABLE_YARR_JIT = 1
++
+ VPATH += $(srcdir)/assembler \
+ $(srcdir)/assembler/wtf \
+ $(srcdir)/assembler/jit \
+ $(srcdir)/assembler/assembler \
+ $(srcdir)/methodjit \
+ $(srcdir)/yarr \
+ $(NONE)
+
+@@ -1076,17 +1078,21 @@ endif
+
+ ###############################################
+ # BEGIN kludges for the Nitro assembler
+ #
+
+ # Needed to "configure" it correctly. Unfortunately these
+ # flags wind up being applied to all code in js/src, not just
+ # the code in js/src/assembler.
+-CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1 -DENABLE_JIT=1
++CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1
++
++ifneq (,$(ENABLE_YARR_JIT)$(ENABLE_TRACEJIT)$(ENABLE_METHODJIT))
++CXXFLAGS += -DENABLE_JIT=1
++endif
+
+ INCLUDES += -I$(srcdir)/assembler -I$(srcdir)/yarr
+
+ ifdef ENABLE_METHODJIT
+ # Build a standalone test program that exercises the assembler
+ # sources a bit.
+ TESTMAIN_OBJS = \
+ Assertions.$(OBJ_SUFFIX) \
--- a/series Wed Nov 09 13:07:30 2011 +0100
+++ b/series Sat Nov 12 16:22:36 2011 +0100
@@ -16,6 +16,7 @@
mozilla-dump_syms-static.patch
mozilla-sle11.patch
mozilla-linux3.patch
+mozilla-ppc64.patch
# Firefox patches
firefox-browser-css.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/xulrunner/mozilla-ppc64.patch Sat Nov 12 16:22:36 2011 +0100
@@ -0,0 +1,1 @@
+../mozilla-ppc64.patch
\ No newline at end of file
--- a/xulrunner/xulrunner.changes Wed Nov 09 13:07:30 2011 +0100
+++ b/xulrunner/xulrunner.changes Sat Nov 12 16:22:36 2011 +0100
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Nov 12 15:20:49 UTC 2011 - wr@rosenauer.org
+
+- fix ppc64 build
+
-------------------------------------------------------------------
Sun Nov 6 08:23:04 UTC 2011 - wr@rosenauer.org
--- a/xulrunner/xulrunner.spec Wed Nov 09 13:07:30 2011 +0100
+++ b/xulrunner/xulrunner.spec Sat Nov 12 16:22:36 2011 +0100
@@ -62,6 +62,7 @@
Patch12: mozilla-dump_syms-static.patch
Patch13: mozilla-sle11.patch
Patch14: mozilla-linux3.patch
+Patch15: mozilla-ppc64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: mozilla-js = %{version}
Requires(post): update-alternatives coreutils
@@ -184,6 +185,7 @@
%patch13 -p1
%endif
%patch14 -p1
+%patch15 -p1
%build
# no need to add build time to binaries