| 1 |
commit: 52881c05b0e493b710f847d16780357ce768135b |
| 2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jul 25 14:20:41 2018 +0000 |
| 4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 25 14:21:14 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52881c05 |
| 7 |
|
| 8 |
dev-lang/spidermonkey: don't hardcode libc soname on :45 and :52 |
| 9 |
|
| 10 |
Applying patch from bug 631574 to both versions as upstream did not |
| 11 |
address this issue until :60 |
| 12 |
|
| 13 |
Bug: http://bugs.gentoo.org/631574 |
| 14 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
| 15 |
|
| 16 |
dev-lang/spidermonkey/spidermonkey-45.0.2.ebuild | 7 ++++--- |
| 17 |
dev-lang/spidermonkey/spidermonkey-52.9.1_pre1.ebuild | 4 ++-- |
| 18 |
2 files changed, 6 insertions(+), 5 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-lang/spidermonkey/spidermonkey-45.0.2.ebuild b/dev-lang/spidermonkey/spidermonkey-45.0.2.ebuild |
| 21 |
index 2602ecc5e97..065995e59d0 100644 |
| 22 |
--- a/dev-lang/spidermonkey/spidermonkey-45.0.2.ebuild |
| 23 |
+++ b/dev-lang/spidermonkey/spidermonkey-45.0.2.ebuild |
| 24 |
@@ -1,4 +1,4 @@ |
| 25 |
-# Copyright 1999-2017 Gentoo Foundation |
| 26 |
+# Copyright 1999-2018 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
|
| 29 |
EAPI=6 |
| 30 |
@@ -9,7 +9,7 @@ MY_PN="mozjs" |
| 31 |
MY_P="${MY_PN}-${PV/_/.}" |
| 32 |
DESCRIPTION="Stand-alone JavaScript C library" |
| 33 |
HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey" |
| 34 |
-SRC_URI="https://people.mozilla.org/~sfink/${MY_P}.tar.bz2 |
| 35 |
+SRC_URI="https://archive.mozilla.org/pub/${PN}/releases/${PV}/${MY_P}.tar.bz2 |
| 36 |
https://dev.gentoo.org/~axs/distfiles/${PN}-slot45-patches-01.tar.xz" |
| 37 |
|
| 38 |
LICENSE="NPL-1.1" |
| 39 |
@@ -40,7 +40,8 @@ src_prepare() { |
| 40 |
"${WORKDIR}"/sm45/mozjs45-1266366.patch \ |
| 41 |
"${WORKDIR}"/sm45/mozjs38-pkg-config-version.patch \ |
| 42 |
"${WORKDIR}"/sm45/mozilla_configure_regexp_esr.patch \ |
| 43 |
- "${WORKDIR}"/sm45/${PN}-${SLOT}-dont-symlink-non-objfiles.patch |
| 44 |
+ "${WORKDIR}"/sm45/${PN}-${SLOT}-dont-symlink-non-objfiles.patch \ |
| 45 |
+ "${FILESDIR}"/moz38-dont-hardcode-libc-soname.patch |
| 46 |
|
| 47 |
# apply relevant (modified) patches from gentoo's firefox-45 patchset |
| 48 |
eapply "${WORKDIR}"/sm45/ff45 |
| 49 |
|
| 50 |
diff --git a/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1.ebuild b/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1.ebuild |
| 51 |
index c8ae70994d2..f1a9493f9fd 100644 |
| 52 |
--- a/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1.ebuild |
| 53 |
+++ b/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1.ebuild |
| 54 |
@@ -17,7 +17,7 @@ SRC_URI="http://ftp.mozilla.org/pub/spidermonkey/prereleases/52/pre1/mozjs-52.9. |
| 55 |
LICENSE="NPL-1.1" |
| 56 |
SLOT="52" |
| 57 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" |
| 58 |
-IUSE="debug +jit minimal +system-icu test" |
| 59 |
+IUSE="debug minimal +system-icu test" |
| 60 |
|
| 61 |
RESTRICT="ia64? ( test )" |
| 62 |
|
| 63 |
@@ -45,6 +45,7 @@ src_prepare() { |
| 64 |
|| die |
| 65 |
|
| 66 |
eapply "${WORKDIR}/${PN}" |
| 67 |
+ eapply "${FILESDIR}"/moz38-dont-hardcode-libc-soname.patch |
| 68 |
#eapply "${FILESDIR}"/${PN}-52-baseconfig.patch |
| 69 |
|
| 70 |
eapply_user |
| 71 |
@@ -76,7 +77,6 @@ src_configure() { |
| 72 |
--with-intl-api \ |
| 73 |
$(use_with system-icu) \ |
| 74 |
$(use_enable debug) \ |
| 75 |
- $(use_enable jit ion) \ |
| 76 |
$(use_enable test tests) \ |
| 77 |
XARGS="/usr/bin/xargs" \ |
| 78 |
SHELL="${SHELL:-${EPREFIX}/bin/bash}" \ |
Archives