commit: e4cd861a39c8552ded3bdfefafbe5d0413ac6990 Author: Austin English <wizardedit <AT> gentoo <DOT> org> AuthorDate: Fri Jun 3 05:22:39 2016 +0000 Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> CommitDate: Fri Jun 10 23:55:13 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4cd861a
dev-lang/spidermonkey: fix building with clang Gentoo-Bug: https://bugs.gentoo.org/458142 Closes: https://github.com/gentoo/gentoo/pull/1589 .../spidermonkey/files/spidermonkey-17-clang.patch | 18 +++ .../spidermonkey/spidermonkey-17.0.0-r5.ebuild | 140 +++++++++++++++++++++ 2 files changed, 158 insertions(+) diff --git a/dev-lang/spidermonkey/files/spidermonkey-17-clang.patch b/dev-lang/spidermonkey/files/spidermonkey-17-clang.patch new file mode 100644 index 0000000..062bd06b --- /dev/null +++ b/dev-lang/spidermonkey/files/spidermonkey-17-clang.patch @@ -0,0 +1,18 @@ +Fix compilation of spidermonkey-17 with clang + +Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=458142 +Upstream-Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=887645 + +b/js/src/js-config.in +--- a/js/src/jsinterp.cpp 2016-06-03 00:08:04.376312080 -0500 ++++ b/js/src/jsinterp.cpp 2016-06-03 00:12:17.740329180 -0500 +@@ -3664,7 +3664,9 @@ + BEGIN_CASE(JSOP_LEAVEFORLETIN) + BEGIN_CASE(JSOP_LEAVEBLOCKEXPR) + { ++ #ifdef DEBUG + DebugOnly<uint32_t> blockDepth = regs.fp()->blockChain().stackDepth(); ++ #endif + + regs.fp()->popBlock(cx); + diff --git a/dev-lang/spidermonkey/spidermonkey-17.0.0-r5.ebuild b/dev-lang/spidermonkey/spidermonkey-17.0.0-r5.ebuild new file mode 100644 index 0000000..897b2a0 --- /dev/null +++ b/dev-lang/spidermonkey/spidermonkey-17.0.0-r5.ebuild @@ -0,0 +1,140 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="6" +WANT_AUTOCONF="2.1" +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="threads" +inherit 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="http://ftp.mozilla.org/pub/mozilla.org/js/${MY_PN}${PV}.tar.gz"; + +LICENSE="NPL-1.1" +SLOT="17" +# "MIPS, MacroAssembler is not supported" wrt #491294 for -mips +KEYWORDS="~alpha ~amd64 ~arm -hppa ~ia64 -mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="debug jit minimal static-libs test" + +REQUIRED_USE="debug? ( jit )" +RESTRICT="ia64? ( test )" + +S="${WORKDIR}/${MY_P}" +BUILDDIR="${S}/js/src" + +RDEPEND=">=dev-libs/nspr-4.9.4 + virtual/libffi + sys-libs/readline:0 + >=sys-libs/zlib-1.1.4" +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 +} + +PATCHES=( + "${FILESDIR}"/${PN}-${SLOT}-js-config-shebang.patch + "${FILESDIR}"/${PN}-${SLOT}-ia64-mmap.patch + "${FILESDIR}"/${PN}-17.0.0-fix-file-permissions.patch + "${FILESDIR}"/${PN}-17-clang.patch + "${FILESDIR}"/${PN}-perl-defined-array-check.patch +) + +src_prepare() { + default + + # Remove obsolete jsuword bug #506160 + sed -i -e '/jsuword/d' "${BUILDDIR}"/jsval.h || die "sed failed" + + 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 +} + +src_configure() { + cd "${BUILDDIR}" || die + + 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 \ + --enable-jemalloc \ + $(use_enable debug) \ + $(use_enable jit tracejit) \ + $(use_enable jit methodjit) \ + $(use_enable static-libs static) \ + $(use_enable test tests) +} + +cross_make() { + emake \ + CFLAGS="${BUILD_CFLAGS}" \ + CXXFLAGS="${BUILD_CXXFLAGS}" \ + AR="${BUILD_AR}" \ + CC="${BUILD_CC}" \ + CXX="${BUILD_CXX}" \ + RANLIB="${BUILD_RANLIB}" \ + "$@" +} +src_compile() { + cd "${BUILDDIR}" || die + if tc-is-cross-compiler; then + tc-export_build_env BUILD_{AR,CC,CXX,RANLIB} + cross_make host_jsoplengen host_jskwgen + cross_make -C config nsinstall + mv {,native-}host_jskwgen || die + mv {,native-}host_jsoplengen || die + mv config/{,native-}nsinstall || die + sed -i \ + -e 's@./host_jskwgen@./native-host_jskwgen@' \ + -e 's@./host_jsoplengen@./native-host_jsoplengen@' \ + Makefile || die + sed -i -e 's@/nsinstall@/native-nsinstall@' 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 + default + + if ! use minimal; then + if use jit; then + pax-mark m "${ED}/usr/bin/js${SLOT}" || die + fi + else + rm -f "${ED}/usr/bin/js${SLOT}" || die + 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 +}
