From: "Jory Pratt" <anarchy@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/mozilla:master commit in: dev-lang/spidermonkey/files/, dev-lang/spidermonkey/
Date: Mon, 1 Apr 2013 18:30:49 +0000 (UTC) [thread overview]
Message-ID: <1364841014.2d0d382e9bc56e3664c162a4b2fa27ec5dbd0a2c.anarchy@gentoo> (raw)
commit: 2d0d382e9bc56e3664c162a4b2fa27ec5dbd0a2c
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 1 18:30:14 2013 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon Apr 1 18:30:14 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=2d0d382e
spidermonkey: 17.0.0 release multiple memory leak issues have been fixed
---
dev-lang/spidermonkey/Manifest | 6 +--
.../files/spidermonkey-1.8.8-filter_desc.patch | 18 ---------
.../files/spidermonkey-1.8.8-symbol-versions.patch | 32 ----------------
...key-1.8.8.ebuild => spidermonkey-17.0.0.ebuild} | 39 +++++---------------
4 files changed, 12 insertions(+), 83 deletions(-)
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 71a5f39..43da2b7 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -1,4 +1,2 @@
-AUX spidermonkey-1.8.8-filter_desc.patch 922 SHA256 e754f29fe76bd14a200725f5a61364c5c00963b1fbaba55fb27b9282bea9d684 SHA512 cc536a582dba7245485f57f02b696248fe6e39ea22ee437a725a7aca8426d8fe70a42c3c3974cf7bf6be2f2a0e44c23f38603c1d116db13533f7ed7c50e84283 WHIRLPOOL 0f98c9df83208be78886e9295b30e44143824e4dda1d457934b76ad4927c6c7aa4be9fa6a69fb1d05dffb598a4539d15a9457f9bf1355500579f7983e9f61fe4
-AUX spidermonkey-1.8.8-symbol-versions.patch 1011 SHA256 87eb0cc07eaec5b6e0ad63cd8dd24230c105c6e15a63fd679e837be5a5c11208 SHA512 07895a3086744a5d18f81fa12b8196bd6aa1e30fbd3242ece14f6a994a49cbdf5b61bba384bef6bd8c227df7c3c2217b121b9279bf93e0a4af2d7b1098488b94 WHIRLPOOL e21c5c005dbce047f2b38b303a404c8faa155a84b6ee9c28204844a15801d9fdbf6768bfbd48aecebd0ddb23c3871e4e658dc100812a56e324e2c68fc8852da0
-DIST js188-1.0.0.tar.xz 4192856 SHA256 219d37f225180e8b2936d9def85a57243bd10d19e69a684a1eeed79ab1394b10 SHA512 1881ca3c216a70b1b6eeef639e3420e046da7ffe98d82d31145d8e9cba0c1fa773cd275c22e61b12c24e8051ac15e9544c613da9864bf3ca48d66a72a00f711c WHIRLPOOL 673ad3865f2afe29c0173726f2631b111bd71952bdc0d9223991e61e6e64844e7aec54680a35fa1b207d4f2479db8361be05afe65c756e18f0b0eb76535b5d4e
-EBUILD spidermonkey-1.8.8.ebuild 3781 SHA256 10a7f7a8a38e98dc1c78b0006713bbebadf5817fbb28d8b02a78c5c55223ed1b SHA512 7be1f05881b35a9bc446e71b81e7bcd585e1e5ab865231a9025ed39a5e3052d169e74ddd45cdf3e5bae6b62d190a17a3ff9820846fc95e57329322deeebcb8d8 WHIRLPOOL f968243de449144dccc54e0a868070c213d04f09be1be4df681d16958912d71b089fd5192202a56cf948987058ff22d9e1bf7975c06aa98a8cd6c4b0f04d1ec0
+DIST mozjs17.0.0.tar.gz 6778934 SHA256 321e964fe9386785d3bf80870640f2fa1c683e32fe988eeb201b04471c172fba SHA512 39b68aeb9f712f146778d8b68ee795709a1372c8ab893a222af4eb34882427d6f5cf877e743d6cb2f1b4348c194d8f3774f00cb775b03515b34b49560b748be4 WHIRLPOOL 4df7b51577787194065162b09d2c3dda849c13fa901305f9925d4ca5d38bb7f8e2daa943099e003fb9d11f9264ae2d77ccf04e5eea11e3ddcb624b504b99d52f
+EBUILD spidermonkey-17.0.0.ebuild 3014 SHA256 b42ce82c55fffb91c0414871585e05a7fe8458d52cc3e2b7345553c98cebc07a SHA512 ceef826441a5e8c6be4f9a2d0432dd8abb09eace29e5e57413c252611f1d3abd15be0e61e7e5e65246a4bc07b1824369ad495ee4968ec5b1a73675d707c51663 WHIRLPOOL 126f7fae0736080d98f83050c2cad4d29553f0f5ac4d53fec52e8b6a7a46f58ecb6788ecf503c6c92fa13e44ed198d83bc0f09bda94e9ce6357bd49120261af8
diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.8-filter_desc.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.8-filter_desc.patch
deleted file mode 100644
index d02c175..0000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.8.8-filter_desc.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/js/src/Makefile.in 2012-06-18 13:53:41.000000000 -0400
-+++ b/js/src/Makefile.in 2012-06-18 13:55:44.000000000 -0400
-@@ -965,10 +965,10 @@
- endif
- endif
-
--install:: $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY)
--ifneq (,$(LIBRARY))
-- $(SYSINSTALL) $(LIBRARY) $(DESTDIR)$(libdir)
-- mv -f $(DESTDIR)$(libdir)/$(LIBRARY) $(subst $(STATIC_LIBRARY_NAME),mozjs188-$(SRCREL_ABI_VERSION),$(DESTDIR)$(libdir)/$(LIBRARY))
-+install:: $(filter-out %.$(LIBS_DESC_SUFFIX),$(LIBRARY)) $(SHARED_LIBRARY) $(IMPORT_LIBRARY)
-+ifneq (,$(filter-out %.$(LIBS_DESC_SUFFIX),$(LIBRARY)))
-+ $(SYSINSTALL) $(filter-out %.$(LIBS_DESC_SUFFIX),$(LIBRARY)) $(DESTDIR)$(libdir)
-+ mv -f $(DESTDIR)$(libdir)/$(filter-out %.$(LIBS_DESC_SUFFIX),$(LIBRARY)) $(subst $(STATIC_LIBRARY_NAME),mozjs188-$(SRCREL_ABI_VERSION),$(DESTDIR)$(libdir)/$(filter-out %.$(LIBS_DESC_SUFFIX),$(LIBRARY)))
- endif
- ifneq (,$(SHARED_LIBRARY))
- ifeq (,$(HOST_BIN_SUFFIX))
-
diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.8-symbol-versions.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.8-symbol-versions.patch
deleted file mode 100644
index 7a0d644..0000000
--- a/dev-lang/spidermonkey/files/spidermonkey-1.8.8-symbol-versions.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Naur js/src/configure.in js.new/src/configure.in
---- a/js/src/symverscript.in 2012-11-07 09:36:16.000000000 -0500
-+++ b/js/src/symverscript.in 2012-11-07 09:37:05.000000000 -0500
-@@ -0,0 +1,4 @@
-+mozjs188 {
-+ global: *;
-+};
-+
-diff -Naur js/src/Makefile.in js.new/src/Makefile.in
---- a/js/src/Makefile.in 2012-11-07 09:36:16.000000000 -0500
-+++ b/js/src/Makefile.in 2012-11-07 09:37:09.000000000 -0500
-@@ -837,7 +837,10 @@
- mozjs185.pc \
- $(NULL)
-
--GARBAGE += $(pkg_config_files)
-+symverscript: symverscript.in
-+ cat $< > $@
-+
-+GARBAGE += $(pkg_config_files) symverscript
-
- %.pc: $(srcdir)/%.pc.in Makefile
- cat $< | sed \
-@@ -872,6 +875,8 @@
- SHLIB_ABI_VER := $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).$(SRCREL_ABI_VERSION)
- SHLIB_EXACT_VER := $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).$(SRCREL_VERSION)
- $(SHARED_LIBRARY): EXTRA_DSO_LDOPTS += -Wl,-soname,$(notdir $(SHLIB_ABI_VER))
-+$(SHARED_LIBRARY): EXTRA_DSO_LDOPTS += -Wl,-version-script,symverscript
-+$(SHARED_LIBRARY): symverscript
- endif
- endif
-
diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.8.ebuild b/dev-lang/spidermonkey/spidermonkey-17.0.0.ebuild
similarity index 73%
rename from dev-lang/spidermonkey/spidermonkey-1.8.8.ebuild
rename to dev-lang/spidermonkey/spidermonkey-17.0.0.ebuild
index 07388bb..571c44f 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.8.8.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-17.0.0.ebuild
@@ -1,30 +1,26 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.7-r3.ebuild,v 1.3 2013/01/06 18:17:18 armin76 Exp $
+# $Header: $
EAPI="5"
WANT_AUTOCONF="2.1"
inherit autotools eutils toolchain-funcs multilib python versionator pax-utils
-MY_PN="js"
-TARBALL_PV="$(replace_all_version_separators '' $(get_version_component_range 1-3))"
-MY_P="${MY_PN}-${PV}"
-TARBALL_P="${MY_PN}${TARBALL_PV}-1.0.0"
-SPIDERPV="${PV}-patches-0.1"
+MY_PN="mozjs"
+MY_P="${MY_PN}${PV}"
DESCRIPTION="Stand-alone JavaScript C library"
HOMEPAGE="http://www.mozilla.org/js/spidermonkey/"
-SRC_URI="http://dev.gentoo.org/~anarchy/dist/${TARBALL_P}.tar.xz"
-# http://dev.gentoo.org/~anarchy/mozilla/patchsets/spidermonkey-${SPIDERPV}.tar.xz"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/js/${MY_PN}${PV}.tar.gz"
LICENSE="NPL-1.1"
-SLOT="0/mozjs188"
+SLOT="0/mozjs17.0.0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa -ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE="debug jit minimal static-libs test"
S="${WORKDIR}/${MY_P}"
BUILDDIR="${S}/js/src"
-RDEPEND=">=dev-libs/nspr-4.7.0
+RDEPEND=">=dev-libs/nspr-4.9.4
virtual/libffi"
DEPEND="${RDEPEND}
app-arch/zip
@@ -40,23 +36,12 @@ pkg_setup(){
}
src_prepare() {
- # Apply patches that are required for misc archs
-# EPATCH_SUFFIX="patch" \
-# EPATCH_FORCE="yes" \
-# epatch "${WORKDIR}/spidermonkey"
-
- epatch "${FILESDIR}"/${P}-filter_desc.patch
- epatch "${FILESDIR}"/${P}-symbol-versions.patch
-
epatch_user
if [[ ${CHOST} == *-freebsd* ]]; then
# Don't try to be smart, this does not work in cross-compile anyway
ln -sfn "${BUILDDIR}/config/Linux_All.mk" "${S}/config/$(uname -s)$(uname -r).mk" || die
fi
-
- cd "${BUILDDIR}" || die
- eautoconf
}
src_configure() {
@@ -116,18 +101,14 @@ src_test() {
src_install() {
cd "${BUILDDIR}" || die
emake DESTDIR="${D}" install
+
if ! use minimal; then
- dobin shell/js
if use jit; then
- pax-mark m "${ED}/usr/bin/js"
+ pax-mark m "${ED}/usr/bin/js1*"
fi
+ else
+ rm -f "${ED}/usr/bin/js1*"
fi
- dohtml README.html
- # install header files needed but not part of build system
- insinto /usr/include/js
- doins ../public/*.h
- insinto /usr/include/js/mozilla
- doins "${S}"/mfbt/*.h
if ! use static-libs; then
# We can't actually disable building of static libraries
next reply other threads:[~2013-04-01 18:30 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-01 18:30 Jory Pratt [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-05-09 21:22 [gentoo-commits] proj/mozilla:master commit in: dev-lang/spidermonkey/files/, dev-lang/spidermonkey/ Ian Stakenvicius
2013-01-30 2:02 Ian Stakenvicius
2012-12-06 21:44 Ian Stakenvicius
2012-12-06 21:29 Ian Stakenvicius
2012-10-21 19:07 Jory Pratt
2012-10-12 19:58 Ian Stakenvicius
2012-06-18 18:27 Jory Pratt
2011-11-14 19:11 Jory Pratt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1364841014.2d0d382e9bc56e3664c162a4b2fa27ec5dbd0a2c.anarchy@gentoo \
--to=anarchy@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox