From 4bdf38313a5f6f30b916a96e1a57baf34d3b39bc Mon Sep 17 00:00:00 2001 From: Sam James Date: Sat, 4 Sep 2021 05:23:11 +0100 Subject: dev-lang/spidermonkey: fix Python use dep (threads) They're now always on. See: 742eeca02a0d06a56f6a69af55bcbcdf42f18ba1 Signed-off-by: Sam James --- .../spidermonkey/spidermonkey-1.8.5-r10.ebuild | 152 +++++++++++++++++++++ dev-lang/spidermonkey/spidermonkey-1.8.5-r9.ebuild | 152 --------------------- 2 files changed, 152 insertions(+), 152 deletions(-) create mode 100644 dev-lang/spidermonkey/spidermonkey-1.8.5-r10.ebuild delete mode 100644 dev-lang/spidermonkey/spidermonkey-1.8.5-r9.ebuild (limited to 'dev-lang/spidermonkey') diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r10.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r10.ebuild new file mode 100644 index 000000000000..7e2de60b12fb --- /dev/null +++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r10.ebuild @@ -0,0 +1,152 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +WANT_AUTOCONF="2.1" +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="threads(+)" +inherit autotools toolchain-funcs multilib python-any-r1 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" +DESCRIPTION="Stand-alone JavaScript C library" +HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey" +SRC_URI="https://archive.mozilla.org/pub/js/${TARBALL_P}.tar.gz + https://dev.gentoo.org/~axs/distfiles/${PN}-slot0-patches-02.tar.xz + " + +LICENSE="NPL-1.1" +SLOT="0/mozjs185" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 x86 ~x64-macos" +IUSE="debug minimal static-libs test" +RESTRICT="!test? ( test )" + +S="${WORKDIR}/${MY_P}" +BUILDDIR="${S}/js/src" + +RDEPEND=">=dev-libs/nspr-4.7.0 + sys-libs/readline:0= + x64-macos? ( dev-libs/jemalloc )" +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + app-arch/zip + virtual/pkgconfig" + +PATCHES=( + "${WORKDIR}"/sm0/${P}-fix-install-symlinks.patch + "${WORKDIR}"/sm0/${P}-fix-ppc64.patch + "${WORKDIR}"/sm0/${P}-arm_respect_cflags-3.patch + "${WORKDIR}"/sm0/${PN}-1.8.7-freebsd-pthreads.patch + "${WORKDIR}"/sm0/${P}-perf_event-check.patch + "${WORKDIR}"/sm0/${P}-symbol-versions.patch + "${WORKDIR}"/sm0/${P}-ia64-fix.patch + "${WORKDIR}"/sm0/${P}-ia64-static-strings.patch + "${WORKDIR}"/sm0/${P}-isfinite.patch + "${FILESDIR}"/${PN}-perl-defined-array-check.patch + "${WORKDIR}"/sm0/${PN}-1.8.7-x32.patch + "${WORKDIR}"/sm0/${P}-gcc6.patch + "${WORKDIR}"/sm0/${P}-drop-asm-volatile-toplevel.patch + "${FILESDIR}"/${P}-LTO.patch +) + +DOCS=( ${S}/README ) +HTML_DOCS=( ${BUILDDIR}/README.html ) + +pkg_setup() { + if [[ ${MERGE_TYPE} != "binary" ]]; then + export LC_ALL="C" + fi +} + +src_prepare() { + pwd + + default + + cd "${BUILDDIR}" || die + eautoconf + + # remove options that are not correct from js-config + sed '/lib-filenames/d' -i "${BUILDDIR}"/js-config.in || die "failed to remove invalid option from js-config" +} + +src_configure() { + cd "${BUILDDIR}" || die + + CC="$(tc-getCC)" CXX="$(tc-getCXX)" \ + AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \ + LD="$(tc-getLD)" \ + ac_cv_lib_dnet_dnet_ntoa=no \ + ac_cv_lib_dnet_stub_dnet_ntoa=no \ + econf \ + ${myopts} \ + --enable-jemalloc \ + --enable-readline \ + --enable-threadsafe \ + --with-system-nspr \ + --disable-optimize \ + --disable-profile-guided-optimization \ + $(use_enable debug) \ + $(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 jscpucfg host_jsoplengen host_jskwgen + cross_make -C config nsinstall + mv {,native-}jscpucfg || die + mv {,native-}host_jskwgen || die + mv {,native-}host_jsoplengen || die + mv config/{,native-}nsinstall || die + sed -i \ + -e 's@./jscpucfg@./native-jscpucfg@' \ + -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 + # for bug 415791 + pax-mark mr jsapi-tests + emake check +} + +src_install() { + cd "${BUILDDIR}" || die + emake DESTDIR="${D}" install + # bug 437520 , exclude js shell for small systems + if ! use minimal ; then + dobin shell/js + pax-mark m "${ED}/usr/bin/js" + fi + einstalldocs + + 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 +} diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r9.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r9.ebuild deleted file mode 100644 index b736bb0eadeb..000000000000 --- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r9.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -WANT_AUTOCONF="2.1" -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="threads" -inherit autotools toolchain-funcs multilib python-any-r1 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" -DESCRIPTION="Stand-alone JavaScript C library" -HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey" -SRC_URI="https://archive.mozilla.org/pub/js/${TARBALL_P}.tar.gz - https://dev.gentoo.org/~axs/distfiles/${PN}-slot0-patches-02.tar.xz - " - -LICENSE="NPL-1.1" -SLOT="0/mozjs185" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 x86 ~x64-macos" -IUSE="debug minimal static-libs test" -RESTRICT="!test? ( test )" - -S="${WORKDIR}/${MY_P}" -BUILDDIR="${S}/js/src" - -RDEPEND=">=dev-libs/nspr-4.7.0 - sys-libs/readline:0= - x64-macos? ( dev-libs/jemalloc )" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - app-arch/zip - virtual/pkgconfig" - -PATCHES=( - "${WORKDIR}"/sm0/${P}-fix-install-symlinks.patch - "${WORKDIR}"/sm0/${P}-fix-ppc64.patch - "${WORKDIR}"/sm0/${P}-arm_respect_cflags-3.patch - "${WORKDIR}"/sm0/${PN}-1.8.7-freebsd-pthreads.patch - "${WORKDIR}"/sm0/${P}-perf_event-check.patch - "${WORKDIR}"/sm0/${P}-symbol-versions.patch - "${WORKDIR}"/sm0/${P}-ia64-fix.patch - "${WORKDIR}"/sm0/${P}-ia64-static-strings.patch - "${WORKDIR}"/sm0/${P}-isfinite.patch - "${FILESDIR}"/${PN}-perl-defined-array-check.patch - "${WORKDIR}"/sm0/${PN}-1.8.7-x32.patch - "${WORKDIR}"/sm0/${P}-gcc6.patch - "${WORKDIR}"/sm0/${P}-drop-asm-volatile-toplevel.patch - "${FILESDIR}"/${P}-LTO.patch -) - -DOCS=( ${S}/README ) -HTML_DOCS=( ${BUILDDIR}/README.html ) - -pkg_setup() { - if [[ ${MERGE_TYPE} != "binary" ]]; then - export LC_ALL="C" - fi -} - -src_prepare() { - pwd - - default - - cd "${BUILDDIR}" || die - eautoconf - - # remove options that are not correct from js-config - sed '/lib-filenames/d' -i "${BUILDDIR}"/js-config.in || die "failed to remove invalid option from js-config" -} - -src_configure() { - cd "${BUILDDIR}" || die - - CC="$(tc-getCC)" CXX="$(tc-getCXX)" \ - AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \ - LD="$(tc-getLD)" \ - ac_cv_lib_dnet_dnet_ntoa=no \ - ac_cv_lib_dnet_stub_dnet_ntoa=no \ - econf \ - ${myopts} \ - --enable-jemalloc \ - --enable-readline \ - --enable-threadsafe \ - --with-system-nspr \ - --disable-optimize \ - --disable-profile-guided-optimization \ - $(use_enable debug) \ - $(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 jscpucfg host_jsoplengen host_jskwgen - cross_make -C config nsinstall - mv {,native-}jscpucfg || die - mv {,native-}host_jskwgen || die - mv {,native-}host_jsoplengen || die - mv config/{,native-}nsinstall || die - sed -i \ - -e 's@./jscpucfg@./native-jscpucfg@' \ - -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 - # for bug 415791 - pax-mark mr jsapi-tests - emake check -} - -src_install() { - cd "${BUILDDIR}" || die - emake DESTDIR="${D}" install - # bug 437520 , exclude js shell for small systems - if ! use minimal ; then - dobin shell/js - pax-mark m "${ED}/usr/bin/js" - fi - einstalldocs - - 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 -} -- cgit v1.2.3-65-gdbad