From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RQ1w9-0003D1-5N for garchives@archives.gentoo.org; Mon, 14 Nov 2011 19:11:21 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EDF1721C032; Mon, 14 Nov 2011 19:11:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9D65421C032 for ; Mon, 14 Nov 2011 19:11:13 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1225B1B4019 for ; Mon, 14 Nov 2011 19:11:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 7B7B580042 for ; Mon, 14 Nov 2011 19:11:12 +0000 (UTC) From: "Jory Pratt" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Message-ID: Subject: [gentoo-commits] proj/mozilla:master commit in: dev-lang/spidermonkey/files/, dev-lang/spidermonkey/ X-VCS-Repository: proj/mozilla X-VCS-Files: dev-lang/spidermonkey/Manifest dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-install-symlinks.patch dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-ppc64.patch dev-lang/spidermonkey/files/spidermonkey-1.9.2.13-as-needed.patch dev-lang/spidermonkey/spidermonkey-1.8.2.13.ebuild dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild X-VCS-Directories: dev-lang/spidermonkey/files/ dev-lang/spidermonkey/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: d624476e7f55ece7dde7127d1dc03ffb8b07eb30 Date: Mon, 14 Nov 2011 19:11:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 628efdb3-a181-4091-85a7-c5ca0510fe86 X-Archives-Hash: 8e27b867b885e98022e93f439b6c7599 commit: d624476e7f55ece7dde7127d1dc03ffb8b07eb30 Author: Jory A. Pratt gentoo org> AuthorDate: Mon Nov 14 19:10:55 2011 +0000 Commit: Jory Pratt gentoo org> CommitDate: Mon Nov 14 19:10:55 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mozilla.git;a= =3Dcommit;h=3Dd624476e Multiple fixed for spidermonkey-1.8.5 --- dev-lang/spidermonkey/Manifest | 7 +- .../spidermonkey-1.8.5-fix-install-symlinks.patch | 15 +++ .../files/spidermonkey-1.8.5-fix-ppc64.patch | 31 +++++++ .../files/spidermonkey-1.9.2.13-as-needed.patch | 22 ----- dev-lang/spidermonkey/spidermonkey-1.8.2.13.ebuild | 74 --------------= - dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild | 94 ++++++++++++++= ++++++ 6 files changed, 144 insertions(+), 99 deletions(-) diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manif= est index 8fbf7dc..61a0e22 100644 --- a/dev-lang/spidermonkey/Manifest +++ b/dev-lang/spidermonkey/Manifest @@ -1,3 +1,4 @@ -AUX spidermonkey-1.9.2.13-as-needed.patch 623 RMD160 2f77a10c5984d078ed1= 87b1b5f469393f8c7a35d SHA1 367571f1d440e46f87d3edcfafbff0d17cce3cdb SHA25= 6 5163be062d23265cc19e9b1acb441ec42ceb2fd678b03076880869b7b9f92f8f -DIST firefox-3.6.13.source.tar.bz2 51478675 RMD160 658409db60a8f412ac74f= f15a8c1d8c4ed85b71e SHA1 1d1bc70d651bce4006687f5762638563c0494267 SHA256 = 4b90775c0f29cb7e170a80894311d8c7a2cd794c50e2124b70d1b83011c45f63 -EBUILD spidermonkey-1.8.2.13.ebuild 1603 RMD160 1e1358b96e3a10dd2fd06238= 726e784d14c7ae44 SHA1 f5564e028be5fa8416fd53a5b1a1ac8861f835f4 SHA256 a90= bf84e00990defacf04c00e9cca36da885ce739b2aa3e9a6f44a9fb2adaf7c +AUX spidermonkey-1.8.5-fix-install-symlinks.patch 484 RMD160 0a6e799e6b4= 7c0011ba02c877e0d190ae3830c62 SHA1 b0f776c06e956024fb0f0553f8056bbce08302= 73 SHA256 4c66d490b6ff22086252ad871242d6d87de2e3fec59b91099864c7881cffd82= 3 +AUX spidermonkey-1.8.5-fix-ppc64.patch 849 RMD160 def597b1b913385b908da7= e09683c23bc5e6e61d SHA1 4700b680441e65854e9fb3108218ea9f0f8d264d SHA256 5= cfdb6a590e02c83cd15732e417da9fdd26bd65490fe07e21c173d375e3c6abc +DIST js185-1.0.0.tar.gz 6164605 RMD160 23e6ddc81d5b63e015aecc1a104b2d3d3= ced5005 SHA1 52a01449c48d7a117b35f213d3e4263578d846d6 SHA256 5d12f7e1f5b4= a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687 +EBUILD spidermonkey-1.8.5.ebuild 2308 RMD160 326b2e3097f0db237d28a0a2417= 0f39be39657bf SHA1 f25c6d765a2008bef18eab74398881918a142d1b SHA256 447f4d= ef37621da91082d3cf7ffcca9e6af7095dcadf8aeddd497a02c2a3a760 diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-install-s= ymlinks.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-instal= l-symlinks.patch new file mode 100644 index 0000000..c867e45 --- /dev/null +++ b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-install-symlinks= .patch @@ -0,0 +1,15 @@ +https://bugzilla.mozilla.org/show_bug.cgi?id=3D628723#c43 + +--- js/src/Makefile.in ++++ js/src/Makefile.in +@@ -888,8 +888,8 @@ + ifeq (,$(HOST_BIN_SUFFIX)) + mv -f $(SHLIB_ANY_VER) $(SHLIB_EXACT_VER) + @[ ! -h $(SHLIB_ABI_VER) ] || rm -f $(SHLIB_ABI_VER) +- ln -s $(SHLIB_EXACT_VER) $(SHLIB_ABI_VER) +- ln -s $(SHLIB_ABI_VER) $(SHLIB_ANY_VER) ++ ln -s $(notdir $(SHLIB_EXACT_VER)) $(SHLIB_ABI_VER) ++ ln -s $(notdir $(SHLIB_ABI_VER)) $(SHLIB_ANY_VER) + endif + endif + ifneq (,$(IMPORT_LIBRARY)) diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-ppc64.pat= ch b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-ppc64.patch new file mode 100644 index 0000000..d7a2b9e --- /dev/null +++ b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-ppc64.patch @@ -0,0 +1,31 @@ +# HG changeset patch +# User Mike Hommey +# Date 1303461188 -7200 +# Node ID 59771590e9203d48ef8cbcd7eaf2f8ae45dbb1c1 +# Parent c4b82ec27d6d6e1c02ef0abb3b6e805bfdd092ec +Bug 638056 - Avoid "The cacheFlush support is missing on this platform" = error on exotic platforms. r=3Dcdleary + +diff --git a/js/src/Makefile.in b/js/src/Makefile.in +--- a/js/src/Makefile.in ++++ b/js/src/Makefile.in +@@ -383,17 +383,17 @@ CPPSRCS +=3D checks.cc \ + platform.cc \ + utils.cc \ + $(NONE) +=20 + # + # END enclude sources for V8 dtoa + ############################################# +=20 +-ifeq (,$(filter-out powerpc sparc,$(TARGET_CPU))) ++ifeq (,$(filter arm %86 x86_64,$(TARGET_CPU))) +=20 + VPATH +=3D $(srcdir)/assembler \ + $(srcdir)/assembler/wtf \ + $(srcdir)/yarr/pcre \ + $(NULL) +=20 + CPPSRCS +=3D pcre_compile.cpp \ + pcre_exec.cpp \ + + diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.9.2.13-as-needed.= patch b/dev-lang/spidermonkey/files/spidermonkey-1.9.2.13-as-needed.patch deleted file mode 100644 index 847bf79..0000000 --- a/dev-lang/spidermonkey/files/spidermonkey-1.9.2.13-as-needed.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/js/src/jsapi-tests/Makefile.in b/js/src/jsapi-tests/Makefil= e.in ---- a/js/src/jsapi-tests/Makefile.in -+++ b/js/src/jsapi-tests/Makefile.in -@@ -55,17 +55,17 @@ CPPSRCS =3D \ - testSameValue.cpp \ - testDebugger.cpp \ - testDefineGetterSetterNonEnumerable.cpp \ - testExtendedEq.cpp \ - $(NULL) -=20 - DEFINES +=3D -DEXPORT_JS_API -=20 --LIBS =3D $(NSPR_LIBS) $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX= ) -+LIBS =3D $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX) $(NSPR_LIBS= ) -=20 - LOCAL_INCLUDES +=3D -I$(topsrcdir) -I.. -=20 - ifdef _MSC_VER - ifdef WINCE - WIN32_EXE_LDFLAGS +=3D -ENTRY:mainACRTStartup - endif - endif diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.2.13.ebuild b/dev-lan= g/spidermonkey/spidermonkey-1.8.2.13.ebuild deleted file mode 100644 index b788c5b..0000000 --- a/dev-lang/spidermonkey/spidermonkey-1.8.2.13.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3D"2" -inherit eutils toolchain-funcs multilib python - -MY_PV=3D"${PV}" -MY_PV=3D"${MY_PV/1.8.2/3.6}" -DESCRIPTION=3D"Stand-alone JavaScript C library" -HOMEPAGE=3D"http://www.mozilla.org/js/spidermonkey/" -REL_URI=3D"http://releases.mozilla.org/pub/mozilla.org/firefox/releases" -SRC_URI=3D"${REL_URI}/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2" - -LICENSE=3D"NPL-1.1" -SLOT=3D"0" -KEYWORDS=3D"alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~x86-fbsd" -IUSE=3D"threadsafe" - -S=3D"${WORKDIR}/mozilla-1.9.2" -BUILDDIR=3D"${S}/js/src" - -RDEPEND=3D"threadsafe? ( >=3Ddev-libs/nspr-4.8.6 )" - -DEPEND=3D"${RDEPEND} - app-arch/zip - =3Ddev-lang/python-2*[threads] - dev-util/pkgconfig" - -pkg_setup(){ - python_set_active_version 2 -} - -src_prepare() { - unpack ${A} - - epatch "${FILESDIR}/${PN}-1.9.2.13-as-needed.patch" - - epatch_user - - cd "${S}" - if [[ ${CHOST} =3D=3D *-freebsd* ]]; then - # Don't try to be smart, this does not work in cross-compile anyway - ln -s "${BUILDDIR}/config/Linux_All.mk" "${S}/config/$(uname -s)$(unam= e -r).mk" - fi -} - -src_configure() { - cd ${BUILDDIR} - - local myconf - - if use threadsafe ; then - myconf=3D"${myconf} --with-system-nspr \ - --enable-threadsafe" - fi - # Disable no-print-directory - MAKEOPTS=3D${MAKEOPTS/--no-print-directory/} - - CC=3D"$(tc-getCC)" CXX=3D"$(tc-getCXX)" LD=3D"$(tc-getLD)" PYTHON=3D"$(= PYTHON)" econf \ - ${myconf} -} - -src_compile() { - cd ${BUILDDIR} - emake -j1 || die "emake failed"; -} - -src_install() { - cd ${BUILDDIR} - emake install DESTDIR=3D"${D}" || die - dodoc ../jsd/README - dohtml README.html -} diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild b/dev-lan= g/spidermonkey/spidermonkey-1.8.5-r1.ebuild new file mode 100644 index 0000000..3b1a293 --- /dev/null +++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.= 8.5.ebuild,v 1.2 2011/07/03 05:36:21 nirbheek Exp $ + +EAPI=3D"3" +inherit eutils toolchain-funcs multilib python versionator + +MY_PN=3D"js" +TARBALL_PV=3D"$(replace_all_version_separators '' $(get_version_componen= t_range 1-3))" +MY_P=3D"${MY_PN}-${PV}" +TARBALL_P=3D"${MY_PN}${TARBALL_PV}-1.0.0" +DESCRIPTION=3D"Stand-alone JavaScript C library" +HOMEPAGE=3D"http://www.mozilla.org/js/spidermonkey/" +SRC_URI=3D"https://ftp.mozilla.org/pub/mozilla.org/js/${TARBALL_P}.tar.g= z" + +LICENSE=3D"NPL-1.1" +SLOT=3D"0" +KEYWORDS=3D"~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE=3D"debug static-libs test" + +S=3D"${WORKDIR}/${MY_P}" +BUILDDIR=3D"${S}/js/src" + +RDEPEND=3D">=3Ddev-libs/nspr-4.7.0" +DEPEND=3D"${RDEPEND} + app-arch/zip + =3Ddev-lang/python-2*[threads] + dev-util/pkgconfig" + +pkg_setup(){ + python_set_active_version 2 + + export LC_ALL=3D"C" +} + +src_prepare() { + # https://bugzilla.mozilla.org/show_bug.cgi?id=3D628723#c43 + epatch "${FILESDIR}/${P}-fix-install-symlinks.patch" + # https://bugzilla.mozilla.org/show_bug.cgi?id=3D638056#c9 + epatch "${FILESDIR}/${P}-fix-ppc64.patch" + + epatch_user + + if [[ ${CHOST} =3D=3D *-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)$(un= ame -r).mk" + fi +} + +src_configure() { + local myopts + + if use debug ; then + myopts=3D"--enable-debug \ + --enable-debugger-info-modules \ + --enable-debug-symbols" + fi + + cd "${BUILDDIR}" + + CC=3D"$(tc-getCC)" CXX=3D"$(tc-getCXX)" LD=3D"$(tc-getLD)" PYTHON=3D"$(= PYTHON)" \ + econf \ + ${myopts} \ + --enable-jemalloc \ + --enable-readline \ + --enable-threadsafe \ + --with-system-nspr \ + $(use_enable static-libs static) \ + $(use_enable test tests) +} + +src_compile() { + cd "${BUILDDIR}" + emake || die +} + +src_test() { + cd "${BUILDDIR}/jsapi-tests" + emake check || die +} + +src_install() { + cd "${BUILDDIR}" + emake DESTDIR=3D"${D}" install || die + dobin shell/js ||die=20 + dodoc ../../README || die + dohtml README.html || die + + if ! use static-libs; then + # We can't actually disable building of static libraries + # They're used by the tests and in a few other places + find "${D}" -iname '*.a' -delete || die + fi +}