[thunderbird-lightning] fix build on secondary arches (cherry-picked from 13afcd4c097c) disable jemalloc on s390(x) (taken f

[Dan Horák]

commit e9756976a82bb23f8b39ee3625acf589536f0efa
Author: Dan Horák <dan at danny.cz>
Date:   Thu Jan 5 22:16:47 2012 +0100

    fix build on secondary arches (cherry-picked from 13afcd4c097c)
    disable jemalloc on s390(x) (taken from xulrunner)

 thunderbird-lightning.spec              |   14 +++++++++++++-
 xulrunner-9.0-secondary-build-fix.patch |   11 +++++++++++
 2 files changed, 24 insertions(+), 1 deletions(-)
---
diff --git a/thunderbird-lightning.spec b/thunderbird-lightning.spec
index ac2e084..80ef843 100644
--- a/thunderbird-lightning.spec
+++ b/thunderbird-lightning.spec
@@ -28,7 +28,7 @@
 Name:           thunderbird-lightning
 Summary:        The calendar extension to Thunderbird
 Version:        1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:            http://www.mozilla.org/projects/calendar/lightning/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Productivity
@@ -46,6 +46,8 @@ Source100:      find-external-requires
 Patch0:         thunderbird-version.patch
 # Fix build on secondary arches (patches copied from xulrunner)
 Patch2:         xulrunner-9.0-secondary-ipc.patch
+# cherry-picked from 13afcd4c097c
+Patch3:         xulrunner-9.0-secondary-build-fix.patch
 
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -107,11 +109,17 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \
 
 cd mozilla
 %patch2 -p2 -b .secondary-ipc
+%patch3 -p2 -b .secondary-build
 cd ..
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
 
+# s390(x) fails to start with jemalloc enabled
+%ifarch s390 s390x
+echo "ac_add_options --disable-jemalloc" >> .mozconfig
+%endif
+
 # Fix permissions
 find -name \*.js | xargs chmod -x
 
@@ -194,6 +202,10 @@ find $RPM_BUILD_ROOT -name \*.so | xargs chmod 0755
 #===============================================================================
 
 %changelog
+* Thu Jan 05 2012 Dan Horák <dan[at]danny.cz> - 1.1-2
+- fix build on secondary arches (cherry-picked from 13afcd4c097c)
+- disable jemalloc on s390(x) (taken from xulrunner)
+
 * Tue Dec 27 2011 Orion Poplawski <orion at cora.nwra.com> - 1.1-1
 - Update to lightning 1.1 final (same as rc1)
 - Update l10n source
diff --git a/xulrunner-9.0-secondary-build-fix.patch b/xulrunner-9.0-secondary-build-fix.patch
new file mode 100644
index 0000000..fc1c1db
--- /dev/null
+++ b/xulrunner-9.0-secondary-build-fix.patch
@@ -0,0 +1,11 @@
+diff -up xulrunner-9.0.1/mozilla-release/js/src/jscompartment.cpp.orig xulrunner-9.0.1/mozilla-release/js/src/jscompartment.cpp
+--- xulrunner-9.0.1/mozilla-release/js/src/jscompartment.cpp.orig	2012-01-04 11:06:39.000000000 +0100
++++ xulrunner-9.0.1/mozilla-release/js/src/jscompartment.cpp	2012-01-04 11:06:43.000000000 +0100
+@@ -50,7 +50,6 @@
+ #include "jswatchpoint.h"
+ #include "jswrapper.h"
+ #include "assembler/wtf/Platform.h"
+-#include "assembler/jit/ExecutableAllocator.h"
+ #include "yarr/BumpPointerAllocator.h"
+ #include "methodjit/MethodJIT.h"
+ #include "methodjit/PolyIC.h"