| 1 |
commit: 1df519416ed0c47660d49fafb4a8f2ade342e9c5 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 16 15:49:56 2020 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 16 15:51:12 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1df51941 |
| 7 |
|
| 8 |
dev-lang/spidermonkey: fix building against glibc-2.32 |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/718616 |
| 11 |
Closes: https://bugs.gentoo.org/737108 |
| 12 |
Package-Manager: Portage-3.0.2, Repoman-2.3.23 |
| 13 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-lang/spidermonkey/Manifest | 1 + |
| 16 |
.../spidermonkey-52.9.1_pre1-r2.ebuild | 160 +++++++++++++++++++++ |
| 17 |
2 files changed, 161 insertions(+) |
| 18 |
|
| 19 |
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest |
| 20 |
index 90ca5554a60..5b6ebeeb83f 100644 |
| 21 |
--- a/dev-lang/spidermonkey/Manifest |
| 22 |
+++ b/dev-lang/spidermonkey/Manifest |
| 23 |
@@ -14,6 +14,7 @@ DIST mozjs-52.9.1pre1.tar.bz2 30178574 BLAKE2B 0920432b5140e78297a9bcbccb54268d7 |
| 24 |
DIST mozjs-60.5.2.tar.bz2 32816585 BLAKE2B 45ac4c9646e1275faf60eeedbf486f802cd106583eb7f640fe2243adc7cbb811dced5cefa94426cceca63468b0112be84078ffcef24cb2b8c1a7b6c8173c0d45 SHA512 5fb73330e7803bdd524fbe7cfdf4e6b72e85d4b22b0c827400317b5d052d1088d36e558ceac376393089e9d03e658b24e69262851fc04a66bbcda47135423dc0 |
| 25 |
DIST mozjs17.0.0.tar.gz 6778934 BLAKE2B a37debf5079fc4c27bb9edd3172c6e7914f6128fac6ffa97b49ac266c477d0916b180fb68ecd0916a52f935959a83d73254b0ba72b4898adc5e3b85927d17d2a SHA512 39b68aeb9f712f146778d8b68ee795709a1372c8ab893a222af4eb34882427d6f5cf877e743d6cb2f1b4348c194d8f3774f00cb775b03515b34b49560b748be4 |
| 26 |
DIST spidermonkey-52.0-patches-0.tar.xz 5172 BLAKE2B 8bcf9477de47ef3b882cd3281efa7f77c16ce11fc93f44446a620917adf629fde8290af1dd69f0930a889aacfee3603bf60eb9c1e718a1dfd3e218a1013b6192 SHA512 88ad640fb0efa4972f1b7782bd0abee1751b73914ee51faade93b25c4d8eec64e7693898842a406c49fc2ab43733404efeccb138afb64d2193b9a5eb612578e3 |
| 27 |
+DIST spidermonkey-52.0-patches-1.tar.xz 3112 BLAKE2B d8f4c44cb2ae290fa51efc4725a2c1b3cd85dd9f04f4ccfa5681ba6df5f37f5d8d4ad6859316a70d0f7647ac2cee014d126f88b7d4ca74a82796f35b141200ef SHA512 5328403e3b9ecd1c456037e7cca374c2453d9331752c48b9466e498e22fd8d4ca6e1804e51140ee0be027fcef7d0c3f26822b1f569305a3b2f03209b7fb15499 |
| 28 |
DIST spidermonkey-60.0-patches-04.tar.xz 4428 BLAKE2B af78049cd9b3ee6a9b689e6253486c4670fd3b506faade7d745dafaa7af329c0bd15cd35e95528a4c96688230f4803130967fb09b97aae2bda0ce0f73acaaf3e SHA512 fb1326a81512146ba98773d4f7e0c4bc1bff0f076897c13f576fcf63b56f6965efeff633eea9160bca9f9bc4546505901084eabc33bc955de0b7ab3d6334387a |
| 29 |
DIST spidermonkey-68.6.0-patches-03.tar.xz 4744 BLAKE2B 2a323ea9b6291e427631f986822e779cd3d302b617a827ff020760bb1b19cacbc588d5c76637e386f62b8b64036b0b665bfecae7fdb08477fa5d7fb13630523c SHA512 1465331b61abc9c14245bc6510f1f6996274795853d12d209d7e0a088b37a1a2488cc5cc61a6c2bd0fe05971dad54b19614fb477ec3176b240aa6e0190e89b47 |
| 30 |
DIST spidermonkey-slot0-patches-01.tar.xz 10488 BLAKE2B 4a5195ac11d1076046424fc10d1416d097fb230cd8b0b28ac8b65d379e0c0518586ced0f48f833dea52b13fb5d300e02664657ab2479bfcc343bc358d394d5d7 SHA512 6c878ed0b50c052989a8b965fed845e9c672b691f4c4b1f98ee82e81a33880e1e6bf1dac8222d71322553282de602a88272dedebbcf50d27967fc172f0a8054a |
| 31 |
|
| 32 |
diff --git a/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1-r2.ebuild b/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1-r2.ebuild |
| 33 |
new file mode 100644 |
| 34 |
index 00000000000..446e7ec198e |
| 35 |
--- /dev/null |
| 36 |
+++ b/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1-r2.ebuild |
| 37 |
@@ -0,0 +1,160 @@ |
| 38 |
+# Copyright 1999-2020 Gentoo Authors |
| 39 |
+# Distributed under the terms of the GNU General Public License v2 |
| 40 |
+ |
| 41 |
+EAPI=6 |
| 42 |
+WANT_AUTOCONF="2.1" |
| 43 |
+inherit autotools toolchain-funcs pax-utils mozcoreconf-v5 |
| 44 |
+ |
| 45 |
+MY_PN="mozjs" |
| 46 |
+MY_P="${MY_PN}-${PV/_rc/.rc}" |
| 47 |
+MY_P="${MY_P/_pre/pre}" |
| 48 |
+DESCRIPTION="Stand-alone JavaScript C++ library" |
| 49 |
+HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey" |
| 50 |
+#SRC_URI="https://people.mozilla.org/~sfink/${MY_P}.tar.bz2" |
| 51 |
+SRC_URI="http://ftp.mozilla.org/pub/spidermonkey/prereleases/52/pre1/mozjs-52.9.1pre1.tar.bz2 -> ${MY_P}.tar.bz2 |
| 52 |
+ https://dev.gentoo.org/~whissi/dist/mozilla/${PN}-52.0-patches-1.tar.xz" |
| 53 |
+ |
| 54 |
+LICENSE="NPL-1.1" |
| 55 |
+SLOT="52" |
| 56 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86" |
| 57 |
+IUSE="debug minimal +system-icu test" |
| 58 |
+ |
| 59 |
+RESTRICT="!test? ( test ) ia64? ( test )" |
| 60 |
+ |
| 61 |
+S="${WORKDIR}/${MY_P%.rc*}" |
| 62 |
+BUILDDIR="${S}/jsobj" |
| 63 |
+ |
| 64 |
+RDEPEND=">=dev-libs/nspr-4.13.1 |
| 65 |
+ virtual/libffi |
| 66 |
+ sys-libs/readline:0= |
| 67 |
+ >=sys-libs/zlib-1.2.3 |
| 68 |
+ system-icu? ( >=dev-libs/icu-58.1:= )" |
| 69 |
+DEPEND="${RDEPEND}" |
| 70 |
+ |
| 71 |
+pkg_setup() { |
| 72 |
+ [[ ${MERGE_TYPE} == "binary" ]] || \ |
| 73 |
+ moz_pkgsetup |
| 74 |
+ |
| 75 |
+ export SHELL="${EPREFIX}/bin/bash" |
| 76 |
+} |
| 77 |
+ |
| 78 |
+src_prepare() { |
| 79 |
+ # remove patches integrated by upstream |
| 80 |
+ rm -f "${WORKDIR}"/${PN}/0002-build-Add-major-version-to-make-parallel-installable.patch \ |
| 81 |
+ "${WORKDIR}"/${PN}/0005-headers-Fix-symbols-visibility.patch \ |
| 82 |
+ "${WORKDIR}"/${PN}/0007-build-Remove-unnecessary-NSPR-dependency.patch \ |
| 83 |
+ "${WORKDIR}"/${PN}/0008-tests-Skip-on-all-64-bit-archs.patch \ |
| 84 |
+ || die |
| 85 |
+ |
| 86 |
+ eapply "${WORKDIR}/${PN}" |
| 87 |
+ eapply "${FILESDIR}"/moz38-dont-hardcode-libc-soname.patch |
| 88 |
+ eapply "${FILESDIR}"/${PN}-52.0-fix-alpha-bitness.patch |
| 89 |
+ eapply "${FILESDIR}"/${PN}-52.0-gcc9-overflow.patch |
| 90 |
+ |
| 91 |
+ eapply_user |
| 92 |
+ |
| 93 |
+ if [[ ${CHOST} == *-freebsd* ]]; then |
| 94 |
+ # Don't try to be smart, this does not work in cross-compile anyway |
| 95 |
+ ln -sfn "${BUILDDIR}/config/Linux_All.mk" "${S}/config/$(uname -s)$(uname -r).mk" || die |
| 96 |
+ fi |
| 97 |
+ |
| 98 |
+ cd "${S}"/js/src || die |
| 99 |
+ eautoconf old-configure.in |
| 100 |
+ eautoconf |
| 101 |
+ |
| 102 |
+ # remove options that are not correct from js-config |
| 103 |
+ sed '/lib-filenames/d' -i "${S}"/js/src/js-config.in || die "failed to remove invalid option from js-config" |
| 104 |
+ |
| 105 |
+ # there is a default config.cache that messes everything up |
| 106 |
+ rm -f "${S}"/js/src/config.cache || die |
| 107 |
+ |
| 108 |
+ mkdir -p "${BUILDDIR}" || die |
| 109 |
+} |
| 110 |
+ |
| 111 |
+src_configure() { |
| 112 |
+ cd "${BUILDDIR}" || die |
| 113 |
+ |
| 114 |
+ tc-export AR RANLIB |
| 115 |
+ |
| 116 |
+ ECONF_SOURCE="${S}/js/src" \ |
| 117 |
+ econf \ |
| 118 |
+ --enable-jemalloc \ |
| 119 |
+ --enable-readline \ |
| 120 |
+ --with-system-nspr \ |
| 121 |
+ --disable-optimize \ |
| 122 |
+ --with-intl-api \ |
| 123 |
+ --with-toolchain-prefix="${CHOST}-" \ |
| 124 |
+ --disable-gold \ |
| 125 |
+ $(use_with system-icu) \ |
| 126 |
+ $(use_enable debug) \ |
| 127 |
+ $(use_enable test tests) \ |
| 128 |
+ XARGS="/usr/bin/xargs" \ |
| 129 |
+ SHELL="${SHELL:-${EPREFIX}/bin/bash}" \ |
| 130 |
+ CC="${CC}" CXX="${CXX}" LD="${LD}" AR="${AR}" RANLIB="${RANLIB}" |
| 131 |
+} |
| 132 |
+ |
| 133 |
+cross_make() { |
| 134 |
+ emake \ |
| 135 |
+ CFLAGS="${BUILD_CFLAGS}" \ |
| 136 |
+ CXXFLAGS="${BUILD_CXXFLAGS}" \ |
| 137 |
+ AR="${BUILD_AR}" \ |
| 138 |
+ CC="${BUILD_CC}" \ |
| 139 |
+ CXX="${BUILD_CXX}" \ |
| 140 |
+ RANLIB="${BUILD_RANLIB}" \ |
| 141 |
+ SHELL="${SHELL:-${EPREFIX}/bin/bash}" \ |
| 142 |
+ "$@" |
| 143 |
+} |
| 144 |
+src_compile() { |
| 145 |
+ cd "${BUILDDIR}" || die |
| 146 |
+ if tc-is-cross-compiler; then |
| 147 |
+ tc-export_build_env BUILD_{AR,CC,CXX,RANLIB} |
| 148 |
+ cross_make \ |
| 149 |
+ MOZ_OPTIMIZE_FLAGS="" MOZ_DEBUG_FLAGS="" \ |
| 150 |
+ HOST_OPTIMIZE_FLAGS="" MODULE_OPTIMIZE_FLAGS="" \ |
| 151 |
+ MOZ_PGO_OPTIMIZE_FLAGS="" \ |
| 152 |
+ host_jsoplengen host_jskwgen |
| 153 |
+ cross_make \ |
| 154 |
+ MOZ_OPTIMIZE_FLAGS="" MOZ_DEBUG_FLAGS="" HOST_OPTIMIZE_FLAGS="" \ |
| 155 |
+ -C config nsinstall |
| 156 |
+ mv {,native-}host_jskwgen || die |
| 157 |
+ mv {,native-}host_jsoplengen || die |
| 158 |
+ mv config/{,native-}nsinstall || die |
| 159 |
+ sed -i \ |
| 160 |
+ -e 's@./host_jskwgen@./native-host_jskwgen@' \ |
| 161 |
+ -e 's@./host_jsoplengen@./native-host_jsoplengen@' \ |
| 162 |
+ Makefile || die |
| 163 |
+ sed -i -e 's@/nsinstall@/native-nsinstall@' config/config.mk || die |
| 164 |
+ rm -f config/host_nsinstall.o \ |
| 165 |
+ config/host_pathsub.o \ |
| 166 |
+ host_jskwgen.o \ |
| 167 |
+ host_jsoplengen.o || die |
| 168 |
+ fi |
| 169 |
+ |
| 170 |
+ MOZ_MAKE_FLAGS="${MAKEOPTS}" \ |
| 171 |
+ SHELL="${SHELL:-${EPREFIX}/bin/bash}" \ |
| 172 |
+ emake \ |
| 173 |
+ MOZ_OPTIMIZE_FLAGS="" MOZ_DEBUG_FLAGS="" \ |
| 174 |
+ HOST_OPTIMIZE_FLAGS="" MODULE_OPTIMIZE_FLAGS="" \ |
| 175 |
+ MOZ_PGO_OPTIMIZE_FLAGS="" |
| 176 |
+} |
| 177 |
+ |
| 178 |
+src_test() { |
| 179 |
+ cd "${BUILDDIR}/js/src/jsapi-tests" || die |
| 180 |
+ ./jsapi-tests || die |
| 181 |
+} |
| 182 |
+ |
| 183 |
+src_install() { |
| 184 |
+ cd "${BUILDDIR}" || die |
| 185 |
+ SHELL="${SHELL:-${EPREFIX}/bin/bash}" \ |
| 186 |
+ emake DESTDIR="${D}" install |
| 187 |
+ |
| 188 |
+ if ! use minimal; then |
| 189 |
+ pax-mark m "${ED}"usr/bin/js${SLOT} |
| 190 |
+ else |
| 191 |
+ rm -f "${ED}"usr/bin/js${SLOT} |
| 192 |
+ fi |
| 193 |
+ |
| 194 |
+ # We can't actually disable building of static libraries |
| 195 |
+ # They're used by the tests and in a few other places |
| 196 |
+ find "${D}" -iname '*.a' -o -iname '*.ajs' -delete || die |
| 197 |
+} |
Archives