commit: 0d1702eb34285ef50359dd927659c3942bf8d357
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 16 20:56:50 2014 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Thu Oct 16 21:16:58 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=0d1702eb
firefox-33: fixed bugs 524556 and 525522
---
.../files/firefox-32.0-hppa-js-configure.patch | 21 ++++++++++++++++
.../files/firefox-33.0-jemalloc-configure.patch | 29 ++++++++++++++++++++++
www-client/firefox/firefox-33.0.ebuild | 7 ++++++
3 files changed, 57 insertions(+)
diff --git a/www-client/firefox/files/firefox-32.0-hppa-js-configure.patch
b/www-client/firefox/files/firefox-32.0-hppa-js-configure.patch
new file mode 100644
index 0000000..c37edda
--- /dev/null
+++ b/www-client/firefox/files/firefox-32.0-hppa-js-configure.patch
@@ -0,0 +1,21 @@
+--- a/mozilla-release/js/src/configure.in
++++ b/mozilla-release/js/src/configure.in
+@@ -958,7 +958,7 @@
+ CPU_ARCH=s390x
+ ;;
+
+-hppa* | parisc)
++hppa* | parisc*)
+ CPU_ARCH=hppa
+ ;;
+
+@@ -2009,6 +2009,9 @@
+ AC_DEFINE(JS_CPU_MIPS)
+ AC_DEFINE(JS_NUNBOX32)
+ ;;
++hppa*)
++ AC_DEFINE(JS_NUNBOX32)
++ ;;
+ esac
+
+ MOZ_ARG_DISABLE_BOOL(ion,
diff --git a/www-client/firefox/files/firefox-33.0-jemalloc-configure.patch
b/www-client/firefox/files/firefox-33.0-jemalloc-configure.patch
new file mode 100644
index 0000000..0e6e11e
--- /dev/null
+++ b/www-client/firefox/files/firefox-33.0-jemalloc-configure.patch
@@ -0,0 +1,29 @@
+--- a/memory/jemalloc/src/configure.ac 2014-10-11 05:06:41.000000000 -0400
++++ b/memory/jemalloc/src/configure.ac 2014-10-16 13:41:10.809799170 -0400
+@@ -887,7 +887,7 @@
+ dnl Check whether the BSD/SUSv1 sbrk() exists. If not, disable DSS support.
+ AC_CHECK_FUNC([sbrk], [have_sbrk="1"], [have_sbrk="0"])
+ if test "x$have_sbrk" = "x1" ; then
+- if test "x$sbrk_deprecated" == "x1" ; then
++ if test "x$sbrk_deprecated" = "x1" ; then
+ AC_MSG_RESULT([Disabling dss allocation because sbrk is deprecated])
+ enable_dss="0"
+ else
+@@ -1180,7 +1180,7 @@
+ printf("%d\n", rv);
+ }
+ ], [je_cv_gcc_builtin_ffsl])
+-if test "x${je_cv_gcc_builtin_ffsl}" == "xyes" ; then
++if test "x${je_cv_gcc_builtin_ffsl}" = "xyes" ; then
+ AC_DEFINE([JEMALLOC_INTERNAL_FFSL], [__builtin_ffsl])
+ AC_DEFINE([JEMALLOC_INTERNAL_FFS], [__builtin_ffs])
+ else
+@@ -1194,7 +1194,7 @@
+ printf("%d\n", rv);
+ }
+ ], [je_cv_function_ffsl])
+- if test "x${je_cv_function_ffsl}" == "xyes" ; then
++ if test "x${je_cv_function_ffsl}" = "xyes" ; then
+ AC_DEFINE([JEMALLOC_INTERNAL_FFSL], [ffsl])
+ AC_DEFINE([JEMALLOC_INTERNAL_FFS], [ffs])
+ else
diff --git a/www-client/firefox/firefox-33.0.ebuild
b/www-client/firefox/firefox-33.0.ebuild
index 72d9d3d..c511bbf 100644
--- a/www-client/firefox/firefox-33.0.ebuild
+++ b/www-client/firefox/firefox-33.0.ebuild
@@ -147,6 +147,9 @@ src_prepare() {
EPATCH_EXCLUDE="8000_gcc49_mozbug999496_ff31.patch" \
epatch "${WORKDIR}/firefox"
+ epatch "${FILESDIR}"/${P}-jemalloc-configure.patch
+ epatch "${FILESDIR}"/${PN}-32.0-hppa-js-configure.patch # bug 524556
+
# Allow user to apply any additional patches without modifing ebuild
epatch_user
@@ -182,6 +185,10 @@ src_prepare() {
# Must run autoconf in js/src
cd "${S}"/js/src || die
eautoconf
+
+ # Need to update jemalloc's configure
+ cd "${S}"/memory/jemalloc/src || die
+ WANT_AUTOCONF= eautoconf
}
src_configure() {
