[xulrunner] fix build on secondary arches (cherry-picked from 13afcd4c097c)
Dan Horák
sharkcz at fedoraproject.org
Wed Jan 4 10:36:19 UTC 2012
commit 2f0001b55f7d50ba30f1b4c72d368e769f04cd87
Author: Dan Horák <dan at danny.cz>
Date: Wed Jan 4 11:36:14 2012 +0100
fix build on secondary arches (cherry-picked from 13afcd4c097c)
xulrunner-9.0-secondary-build-fix.patch | 11 +++++++++++
xulrunner.spec | 8 +++++++-
2 files changed, 18 insertions(+), 1 deletions(-)
---
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"
diff --git a/xulrunner.spec b/xulrunner.spec
index 70f3391..9ac1d72 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -53,7 +53,7 @@
Summary: XUL Runtime for Gecko Applications
Name: xulrunner
Version: 9.0.1
-Release: 2%{?pre_tag}%{?dist}
+Release: 3%{?pre_tag}%{?dist}
URL: http://developer.mozilla.org/En/XULRunner
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@@ -86,6 +86,8 @@ Patch38: mozilla-696393.patch
# https://bugzilla.mozilla.org/show_bug.cgi?id=707993
Patch39: xulrunner-8.0-fix-maemo-checks-in-npapi.patch
Patch40: mozilla-682832-proxy.patch
+# cherry-picked from 13afcd4c097c
+Patch41: xulrunner-9.0-secondary-build-fix.patch
# ---------------------------------------------------
@@ -211,6 +213,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{gecko_dir_ver}/' %{P:%%PATCH0} \
%patch38 -p2 -b .696393
%patch39 -p1 -b .707993
%patch40 -p1 -b .682832
+%patch41 -p2 -b .secondary-build
%{__rm} -f .mozconfig
%{__cp} %{SOURCE10} .mozconfig
@@ -468,6 +471,9 @@ fi
#---------------------------------------------------------------------
%changelog
+* Wed Jan 04 2012 Dan Horák <dan[at]danny.cz> - 9.0.1-3
+- fix build on secondary arches (cherry-picked from 13afcd4c097c)
+
* Fri Dec 23 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 9.0.1-2
- Add compile options for ARM hfp/sfp - RHBZ #738509
More information about the scm-commits
mailing list