From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 05F92138334 for ; Mon, 12 Aug 2019 16:42:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 34AC9E03EC; Mon, 12 Aug 2019 16:42:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 01F56E03EC for ; Mon, 12 Aug 2019 16:42:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7691134999F for ; Mon, 12 Aug 2019 16:42:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 526FF6DB for ; Mon, 12 Aug 2019 16:42:08 +0000 (UTC) From: "Jory Pratt" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Message-ID: <1565628114.baafb75e07e283c3387ccabb46e43f67dcadcdac.anarchy@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/spidermonkey/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r3.ebuild X-VCS-Directories: dev-lang/spidermonkey/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: baafb75e07e283c3387ccabb46e43f67dcadcdac X-VCS-Branch: master Date: Mon, 12 Aug 2019 16:42:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 61b1b134-2966-47a2-928f-fbc04b7a3bbb X-Archives-Hash: e29c897436d23bfae9e5ea47c58a845a commit: baafb75e07e283c3387ccabb46e43f67dcadcdac Author: Jory Pratt gentoo org> AuthorDate: Mon Aug 12 16:41:06 2019 +0000 Commit: Jory Pratt gentoo org> CommitDate: Mon Aug 12 16:41:54 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=baafb75e dev-lang/spidermonkey: Fix :60 invalid options in js60-config Fixes: https://bugs.gentoo.org/691334 Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: Jory Pratt gentoo.org> .../spidermonkey/spidermonkey-60.5.2_p0-r3.ebuild | 154 +++++++++++++++++++++ 1 file changed, 154 insertions(+) diff --git a/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r3.ebuild b/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r3.ebuild new file mode 100644 index 00000000000..ec29ac35830 --- /dev/null +++ b/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r3.ebuild @@ -0,0 +1,154 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +WANT_AUTOCONF="2.1" +inherit autotools check-reqs toolchain-funcs pax-utils mozcoreconf-v5 + +MY_PN="mozjs" +MY_P="${MY_PN}-${PV/_rc/.rc}" +MY_P="${MY_P/_pre/pre}" +MY_P="${MY_P%_p[0-9]*}" +DESCRIPTION="Stand-alone JavaScript C++ library" +HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey" +#SRC_URI="https://archive.mozilla.org/pub/spidermonkey/prereleases/60/pre3/${MY_P}.tar.bz2 +SRC_URI="https://dev.gentoo.org/~axs/distfiles/${MY_P}.tar.bz2 + https://dev.gentoo.org/~anarchy/mozilla/patchsets/${PN}-60.0-patches-04.tar.xz" + +LICENSE="NPL-1.1" +SLOT="60" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="debug +jit minimal +system-icu test" + +RESTRICT="ia64? ( test )" + +S="${WORKDIR}/${MY_P%.rc*}" + +BUILDDIR="${S}/jsobj" + +RDEPEND=">=dev-libs/nspr-4.13.1 + virtual/libffi + sys-libs/readline:0= + >=sys-libs/zlib-1.2.3:= + system-icu? ( >=dev-libs/icu-59.1:= )" +DEPEND="${RDEPEND}" + +pkg_pretend() { + CHECKREQS_DISK_BUILD="2G" + + check-reqs_pkg_setup +} +pkg_setup(){ + [[ ${MERGE_TYPE} == "binary" ]] || \ + moz_pkgsetup + export SHELL="${EPREFIX}/bin/bash" +} + +src_prepare() { + eapply "${WORKDIR}/${PN}" + eapply "${FILESDIR}/${PN}-60.5.2-ia64-support.patch" + + eapply_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 "${S}/js/src" || die + eautoconf old-configure.in + eautoconf + + # remove options that are not correct from js-config + sed '/ib-filenames/d' -i "${S}"/js/src/build/js-config.in + + # there is a default config.cache that messes everything up + rm -f "${S}/js/src"/config.cache || die + + mkdir -p "${BUILDDIR}" || die +} + +src_configure() { + cd "${BUILDDIR}" || die + + ECONF_SOURCE="${S}/js/src" \ + econf \ + --disable-jemalloc \ + --enable-readline \ + --with-system-nspr \ + --with-system-zlib \ + --disable-optimize \ + --with-intl-api \ + $(use_with system-icu) \ + $(use_enable debug) \ + $(use_enable jit ion) \ + $(use_enable test tests) \ + XARGS="/usr/bin/xargs" \ + CONFIG_SHELL="${EPREFIX}/bin/bash" \ + CC="${CC}" CXX="${CXX}" LD="${LD}" AR="${AR}" RANLIB="${RANLIB}" +} + +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 \ + MOZ_OPTIMIZE_FLAGS="" MOZ_DEBUG_FLAGS="" \ + HOST_OPTIMIZE_FLAGS="" MODULE_OPTIMIZE_FLAGS="" \ + MOZ_PGO_OPTIMIZE_FLAGS="" \ + host_jsoplengen host_jskwgen + cross_make \ + MOZ_OPTIMIZE_FLAGS="" MOZ_DEBUG_FLAGS="" HOST_OPTIMIZE_FLAGS="" \ + -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 + + MOZ_MAKE_FLAGS="${MAKEOPTS}" \ + emake \ + MOZ_OPTIMIZE_FLAGS="" MOZ_DEBUG_FLAGS="" \ + HOST_OPTIMIZE_FLAGS="" MODULE_OPTIMIZE_FLAGS="" \ + MOZ_PGO_OPTIMIZE_FLAGS="" +} + +src_test() { + cd "${BUILDDIR}/js/src/jsapi-tests" || die + ./jsapi-tests || die +} + +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 + + # 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' -o -iname '*.ajs' -delete || die +}