diff options
author | Jory Pratt <anarchy@gentoo.org> | 2019-06-18 07:19:10 -0500 |
---|---|---|
committer | Jory Pratt <anarchy@gentoo.org> | 2019-06-18 07:19:10 -0500 |
commit | e4ccde83a06c4e028a420347cb3e617b054b57d9 (patch) | |
tree | 684d2f32470b9ffc99bef470ebc4b38781570b09 /dev-lang/spidermonkey | |
parent | sys-kernel/gentoo-sources: amd64 stable wrt bug #688256 (diff) | |
download | gentoo-e4ccde83a06c4e028a420347cb3e617b054b57d9.tar.gz gentoo-e4ccde83a06c4e028a420347cb3e617b054b57d9.tar.bz2 gentoo-e4ccde83a06c4e028a420347cb3e617b054b57d9.zip |
dev-lang/spidermonkey: Fix LTO compilations
Thanks-to: Alexander Miller <alex.miller@gmx.de>
Closes: https://bugs.gentoo.org/687812
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Jory Pratt <anarchy@gentoo.org>
Diffstat (limited to 'dev-lang/spidermonkey')
-rw-r--r-- | dev-lang/spidermonkey/files/spidermonkey-1.8.5-LTO.patch | 58 | ||||
-rw-r--r-- | dev-lang/spidermonkey/spidermonkey-1.8.5-r8.ebuild | 148 |
2 files changed, 206 insertions, 0 deletions
diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-LTO.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-LTO.patch new file mode 100644 index 000000000000..7c36b5525b04 --- /dev/null +++ b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-LTO.patch @@ -0,0 +1,58 @@ +From 6ff7ad09daf98e5b804cf73c066c382a76e74e8c Mon Sep 17 00:00:00 2001 +From: Alexander Miller <alex.miller@gmx.de> +Date: Wed, 12 Jun 2019 00:29:23 -0500 +Subject: [PATCH] Fix breakage with lto builds + +<artificial>:(.text+0x7a): undefined reference to `PopActiveVMFrame' +collect2: error: ld returned 1 exit status + +Signed-off-by: Alexander Miller <alex.miller@gmx.de> +--- + js/src/methodjit/InvokeHelpers.cpp | 2 +- + js/src/methodjit/MethodJIT.cpp | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/js/src/methodjit/InvokeHelpers.cpp b/js/src/methodjit/InvokeHelpers.cpp +index d017c2a..abde396 100644 +--- a/js/src/methodjit/InvokeHelpers.cpp ++++ b/js/src/methodjit/InvokeHelpers.cpp +@@ -500,7 +500,7 @@ stubs::PutActivationObjects(VMFrame &f) + js::PutActivationObjects(f.cx, f.fp()); + } + +-extern "C" void * ++extern "C" void * __attribute__((used)) + js_InternalThrow(VMFrame &f) + { + JSContext *cx = f.cx; +diff --git a/js/src/methodjit/MethodJIT.cpp b/js/src/methodjit/MethodJIT.cpp +index 4feefbc..66099e6 100644 +--- a/js/src/methodjit/MethodJIT.cpp ++++ b/js/src/methodjit/MethodJIT.cpp +@@ -120,20 +120,20 @@ static uint32 StubCallsForOp[STUB_CALLS_FOR_OP_COUNT]; + + extern "C" void JaegerTrampolineReturn(); + +-extern "C" void JS_FASTCALL ++extern "C" void JS_FASTCALL __attribute__((used)) + PushActiveVMFrame(VMFrame &f) + { + f.entryfp->script()->compartment->jaegerCompartment->pushActiveFrame(&f); + f.regs.fp->setNativeReturnAddress(JS_FUNC_TO_DATA_PTR(void*, JaegerTrampolineReturn)); + } + +-extern "C" void JS_FASTCALL ++extern "C" void JS_FASTCALL __attribute__((used)) + PopActiveVMFrame(VMFrame &f) + { + f.entryfp->script()->compartment->jaegerCompartment->popActiveFrame(); + } + +-extern "C" void JS_FASTCALL ++extern "C" void JS_FASTCALL __attribute__((used)) + SetVMFrameRegs(VMFrame &f) + { + f.cx->setCurrentRegs(&f.regs); +-- +2.22.0 + diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r8.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r8.ebuild new file mode 100644 index 000000000000..cb71d7631a58 --- /dev/null +++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r8.ebuild @@ -0,0 +1,148 @@ +# Copyright 1999-2019 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 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos" +IUSE="debug minimal static-libs 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 +} + +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 +} |