rpm/MozillaThunderbird
SHA256
1
0
Fork 0
forked from pool/MozillaThunderbird
Code Pull Requests Activity

Accepting request 92962 from home:k0da:ppc

Browse Source 
fix ppc64 build, disabled crashreporter for now

OBS-URL: https://build.opensuse.org/request/show/92962
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaThunderbird?expand=0&rev=146
This commit is contained in:
Wolfgang Rosenauer 2011-11-21 21:53:27 +00:00 committed by Git OBS Bridge
parent 3eafb797bd
commit 042186d937
4 changed files with 63 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MozillaThunderbird.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Nov 21 11:35:56 UTC 2011 - dvaleev@suse.com
- fix powerpc build
- disable crashreporter on ppc and ppc64
-------------------------------------------------------------------
Mon Nov 7 20:23:30 UTC 2011 - wr@rosenauer.org

8
MozillaThunderbird.spec
View File

@ -54,11 +54,17 @@ Patch4: mozilla-dump_syms-static.patch
Patch10: tb-ssldap.patch
Patch11: tb-develdirs.patch
Patch12: thunderbird-shared-nss-db.patch
Patch20: mozilla-ppc64.patch
Patch21: mozilla-ipc.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: coreutils fileutils textutils /bin/sh
### build options
%define build_enigmail 1
%ifnarch ppc ppc64
%define crashreporter 1
%else
%define crashreporter 0
%endif
%define has_system_cairo 0
%define localize 1
### build options end
@ -172,6 +178,8 @@ popd
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch20 -p1
%patch21
%build
# no need to add build time to binaries

12
mozilla-ipc.patch Normal file
View File

@ -0,0 +1,12 @@
--- mozilla/ipc/chromium/src/build/build_config.h.orig 2011-11-21 12:18:33.736681000 +0100
+++ mozilla/ipc/chromium/src/build/build_config.h 2011-11-21 12:19:47.289191000 +0100
@@ -57,6 +57,9 @@
#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

37
mozilla-ppc64.patch Normal file
View File

@ -0,0 +1,37 @@
From: Mike Hommey <mh@glandium.org>
Date: Sat, 20 Aug 2011 14:56:49 +0200
Subject: Bug 670719 - Only add -DENABLE_JIT=1 to CXXFLAGS if any of
trace/method/yarr jit is enabled.
---
mozilla/js/src/Makefile.in | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/mozilla/js/src/Makefile.in b/mozilla/js/src/Makefile.in
index 79d4ae7..23320d1 100644
--- a/mozilla/js/src/Makefile.in
+++ b/mozilla/js/src/Makefile.in
@@ -439,6 +439,9 @@ else
###############################################
# BEGIN include sources for the Nitro assembler
#
+
+ENABLE_YARR_JIT = 1
+
VPATH += $(srcdir)/assembler \
$(srcdir)/assembler/wtf \
$(srcdir)/assembler/jit \
@@ -1099,7 +1102,11 @@ endif
# 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
--