axs         14/05/23 21:13:46

  Modified:             ChangeLog
  Added:                spidermonkey-24.2.0-r2.ebuild
  Log:
  changed the flags that USE=jit controls on spidermonkey24 ; addresses bug 
510982
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 
2B6559ED)

Revision  Changes    Path
1.150                dev-lang/spidermonkey/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/spidermonkey/ChangeLog?rev=1.150&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/spidermonkey/ChangeLog?rev=1.150&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/spidermonkey/ChangeLog?r1=1.149&r2=1.150

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- ChangeLog   5 May 2014 20:28:23 -0000       1.149
+++ ChangeLog   23 May 2014 21:13:46 -0000      1.150
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/spidermonkey
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.149 
2014/05/05 20:28:23 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/ChangeLog,v 1.150 
2014/05/23 21:13:46 axs Exp $
+
+*spidermonkey-24.2.0-r2 (23 May 2014)
+
+  23 May 2014; Ian Stakenvicius (_AxS_) <a...@gentoo.org>
+  +spidermonkey-24.2.0-r2.ebuild:
+  changed the flags that USE=jit controls on spidermonkey24 ; addresses bug
+  510982
 
   05 May 2014; Ian Stakenvicius (_AxS_) <a...@gentoo.org>
   +files/spidermonkey-24-upward-growing-stack.patch,



1.1                  dev-lang/spidermonkey/spidermonkey-24.2.0-r2.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/spidermonkey/spidermonkey-24.2.0-r2.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/spidermonkey/spidermonkey-24.2.0-r2.ebuild?rev=1.1&content-type=text/plain

Index: spidermonkey-24.2.0-r2.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: 
/var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-24.2.0-r2.ebuild,v 
1.1 2014/05/23 21:13:46 axs Exp $

EAPI="5"
WANT_AUTOCONF="2.1"
PYTHON_COMPAT=( python2_{6,7} )
PYTHON_REQ_USE="threads"
inherit autotools eutils toolchain-funcs multilib python-any-r1 versionator 
pax-utils

MY_PN="mozjs"
MY_P="${MY_PN}-${PV/_/.}"
DESCRIPTION="Stand-alone JavaScript C library"
HOMEPAGE="http://www.mozilla.org/js/spidermonkey/";
SRC_URI="https://ftp.mozilla.org/pub/mozilla.org/js/${MY_P}.tar.bz2";

LICENSE="NPL-1.1"
SLOT="24"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86 ~x86-fbsd"
IUSE="debug icu jit minimal static-libs +system-icu test"

RESTRICT="ia64? ( test )"

S="${WORKDIR}/${MY_P%.rc*}"
BUILDDIR="${S}/js/src"

RDEPEND=">=dev-libs/nspr-4.9.4
        virtual/libffi
        >=sys-libs/zlib-1.1.4
        system-icu? ( >=dev-libs/icu-1.51:= )"
DEPEND="${RDEPEND}
        ${PYTHON_DEPS}
        app-arch/zip
        virtual/pkgconfig"

pkg_setup(){
        if [[ ${MERGE_TYPE} != "binary" ]]; then
                python-any-r1_pkg_setup
                export LC_ALL="C"
        fi
}

src_prepare() {
        epatch "${FILESDIR}"/${PN}-${SLOT}-system-icu.patch
        epatch "${FILESDIR}"/${PN}-24.2.0-fix-file-permissions.patch
        epatch "${FILESDIR}"/${PN}-${SLOT}-upward-growing-stack.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() {
        cd "${BUILDDIR}" || die

        local myopts=""
        if use icu; then # make sure system-icu flag only affects icu-enabled 
build
                myopts+="$(use_with system-icu)"
        else
                myopts+="--without-system-icu"
        fi

        CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
        AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
        LD="$(tc-getLD)" \
        econf \
                ${myopts} \
                --enable-jemalloc \
                --enable-readline \
                --enable-threadsafe \
                --with-system-nspr \
                --enable-system-ffi \
                $(use_enable icu intl-api) \
                $(use_enable debug) \
                $(use_enable jit yarr-jit) \
                $(use_enable jit ion) \
                $(use_enable static-libs static) \
                $(use_enable test tests)
}

src_compile() {
        cd "${BUILDDIR}" || die
        if tc-is-cross-compiler; then
                make CFLAGS="" CXXFLAGS="" \
                        CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \
                        AR=$(tc-getBUILD_AR) RANLIB=$(tc-getBUILD_RANLIB) \
                        jscpucfg host_jsoplengen host_jskwgen || die
                make CFLAGS="" CXXFLAGS="" \
                        CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) \
                        AR=$(tc-getBUILD_AR) RANLIB=$(tc-getBUILD_RANLIB) \
                        -C config nsinstall || die
                mv {,native-}jscpucfg || die
                mv {,native-}host_jskwgen || die
                mv {,native-}host_jsoplengen || die
                mv config/{,native-}nsinstall || die
                sed -e 's@./jscpucfg@./native-jscpucfg@' \
                        -e 's@./host_jskwgen@./native-host_jskwgen@' \
                        -e 's@./host_jsoplengen@./native-host_jsoplengen@' \
                        -i Makefile || die
                sed -e 's@/nsinstall@/native-nsinstall@' -i config/config.mk || 
die
                rm -f config/host_nsinstall.o \
                        config/host_pathsub.o \
                        host_jskwgen.o \
                        host_jsoplengen.o || die
        fi
        emake
}

src_test() {
        cd "${BUILDDIR}/jsapi-tests" || die
        emake check
}

src_install() {
        cd "${BUILDDIR}" || die
        emake DESTDIR="${D}" install

        if ! use minimal; then
                if use jit; then
                        pax-mark m "${ED}/usr/bin/js${SLOT}"
                fi
        else
                rm -f "${ED}/usr/bin/js${SLOT}"
        fi

        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
}




Reply via email to