commit: 1398b77a96625ee50dd430fb4d265b7f793322be Author: Marek Szuba <marecki <AT> gentoo <DOT> org> AuthorDate: Mon Nov 9 13:52:36 2020 +0000 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> CommitDate: Mon Nov 9 15:05:39 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1398b77a
net-libs/nodejs: bump to 14.15.0 Includes subslotting, support for building against bundled ICU, a fix for PPC64 crashes and python3_9 support. Closes: https://bugs.gentoo.org/724978 Closes: https://bugs.gentoo.org/728110 Closes: https://bugs.gentoo.org/747100 Closes: https://bugs.gentoo.org/749852 Closes: https://github.com/gentoo/gentoo/pull/17809 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> net-libs/nodejs/Manifest | 2 +- .../files/nodejs-14.15.0-fix_ppc64_crashes.patch | 33 +++++++++++ net-libs/nodejs/metadata.xml | 1 + ...nodejs-14.14.0.ebuild => nodejs-14.15.0.ebuild} | 64 ++++++++++------------ 4 files changed, 65 insertions(+), 35 deletions(-) diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest index f2f49ce2d02..00154d0e2bf 100644 --- a/net-libs/nodejs/Manifest +++ b/net-libs/nodejs/Manifest @@ -4,6 +4,6 @@ DIST node-v14.11.0.tar.xz 33379456 BLAKE2B 99e2eba4ba2e54209836fa1e3b63e42caf854 DIST node-v14.12.0.tar.xz 33390472 BLAKE2B 930b196ada16d21e2d2b43d030d936391e039cc985ee517b6b420277baa071ecef8c8cef7bd2f24b5e167465e9d4acc6b0da36ae4e7332fe179c47724e05ff50 SHA512 168141a3e3f20be98a0e800a8e8f70e1ff330ff087cc08c31d6ae185882615723166f445d6310a23e1bb5a023e671a74834b40e1b83f2b789f65c787c18762e2 DIST node-v14.13.0.tar.xz 33418156 BLAKE2B 8a986a467b77485fbe2bc9d580c48ae72536d6d62c826319b787d2937c86358787ae452676b69df608adb9d9754f4cd068b729614989a4f2a93973380c4929d1 SHA512 7a75bff501520afbe15d6ceea4b4507717111c87cf03de47047af790df2e2e9d71da9501c7256d5dd9f58616c3d04db2e74401dfbcbd72abbd0c81778a588893 DIST node-v14.13.1.tar.xz 33428732 BLAKE2B f3a7349ea4a13b47a66272b74fb7273d6071c35d7d047b147da13d5fd97a912a0770047ceed4d298f0999b9cab57aee81aaac44a6ffec59df1ee1d2ec9156e7b SHA512 a0ad1e6e4be887d56388d0cbe30d72e87fefdaa71be8fe8c96e3dce470821730741b7beff23c67277ab02991aa9813e9fb708b6b708a2cf108c5442a59d527a0 -DIST node-v14.14.0.tar.xz 33439920 BLAKE2B 6cea7fdb00cc0857d5dc46dbd83dc6387ef8a7561afd8616dfc37bf28981faa9dffd664b6e38035e13ec9c7720ec13c2499e948d412e8446e7dc39736852f045 SHA512 d5af1fa219297a8779e031bd94755212f002b6655539929f8fa8cd69a9c1c4b824fa0ccfa961b52023b92d2975e4fd2ec44c0fb238efac0b1a6e2bdfd2b7cff7 +DIST node-v14.15.0.tar.xz 33440584 BLAKE2B dda9fb44f163b2268db126dfcda34e80064eba24921e4f8e6c14c212deb9170c79f31f7b2be272c8fa7ca992d14540df490c6cad078833514bd348825934ad95 SHA512 2a0cd1b9d95e0ac228a90aca82cb04b9f4fc4d08ab86f0286eed7a519ca6e756081b37375ad5d14d7f0e09affdd27bad658c3e364237eb3c212fe5b5e27af96e DIST node-v14.2.0.tar.xz 32884616 BLAKE2B 7bcb07cb7623c5e08c20267c320cdf23ad110f124c5ad1f2447ef8b76ab8dc44ed50dab7c5651424d9d3a36f7eeecdf3292b07c02cb2e22c3fbe4ed633c4b842 SHA512 47e5ec0b7a207082d43419a7e0a6ea9242ec43b4d7c2217eb66d0b45e2f4d5cb561b3f6fe35fdc41a8be95c182dc122ba262f696ebd12833596d71b372ec85d2 DIST node-v14.4.0.tar.xz 33005312 BLAKE2B bc1462d897e24a6b842e6f8146971866c73b54ff5383d76cfc5728a73e2c135d28ced068744174b3fb5af4a6ec05ef1f115ea51c2d65517cbe18e1d733460d04 SHA512 f1a7c788a8a149b942ec2b90a4314baaa5355c381029eda45002728ce7209925c016323b0ec1e0dfe2359fddb24f494df125805d0d266b738a333dcddb3f59c3 diff --git a/net-libs/nodejs/files/nodejs-14.15.0-fix_ppc64_crashes.patch b/net-libs/nodejs/files/nodejs-14.15.0-fix_ppc64_crashes.patch new file mode 100644 index 00000000000..c9c01843cd6 --- /dev/null +++ b/net-libs/nodejs/files/nodejs-14.15.0-fix_ppc64_crashes.patch @@ -0,0 +1,33 @@ +--- a/deps/v8/src/compiler/backend/instruction-selector.cc ++++ b/deps/v8/src/compiler/backend/instruction-selector.cc +@@ -2808,7 +2808,7 @@ + switch (call_descriptor->kind()) { + case CallDescriptor::kCallAddress: { + int misc_field = static_cast<int>(call_descriptor->ParameterCount()); +-#if defined(_AIX) ++#if ABI_USES_FUNCTION_DESCRIPTORS + // Highest misc_field bit is used on AIX to indicate if a CFunction call + // has function descriptor or not. + if (!call_descriptor->NoFunctionDescriptor()) { +--- a/deps/v8/src/compiler/backend/ppc/code-generator-ppc.cc ++++ b/deps/v8/src/compiler/backend/ppc/code-generator-ppc.cc +@@ -1039,7 +1039,7 @@ + linkage()->GetIncomingDescriptor()->IsWasmCapiFunction(); + int offset = (FLAG_enable_embedded_constant_pool ? 20 : 23) * kInstrSize; + +-#if defined(_AIX) ++#if ABI_USES_FUNCTION_DESCRIPTORS + // AIX/PPC64BE Linux uses a function descriptor + int kNumParametersMask = kHasFunctionDescriptorBitMask - 1; + num_parameters = kNumParametersMask & misc_field; +--- a/deps/v8/src/execution/simulator.h ++++ b/deps/v8/src/execution/simulator.h +@@ -128,7 +128,7 @@ + #if defined(V8_TARGET_OS_WIN) && !defined(V8_OS_WIN) + FATAL("Generated code execution not possible during cross-compilation."); + #endif // defined(V8_TARGET_OS_WIN) && !defined(V8_OS_WIN) +-#if V8_OS_AIX ++#if ABI_USES_FUNCTION_DESCRIPTORS + // AIX ABI requires function descriptors (FD). Artificially create a pseudo + // FD to ensure correct dispatch to generated code. The 'volatile' + // declaration is required to avoid the compiler from not observing the diff --git a/net-libs/nodejs/metadata.xml b/net-libs/nodejs/metadata.xml index 0c48f58c533..c23cc81d8e4 100644 --- a/net-libs/nodejs/metadata.xml +++ b/net-libs/nodejs/metadata.xml @@ -11,6 +11,7 @@ <flag name="npm">Enable NPM package manager</flag> <flag name="pax_kernel">Enable building under a PaX enabled kernel</flag> <flag name="snapshot">Enable snapshot creation for faster startup</flag> + <flag name="system-icu">Use system <pkg>dev-libs/icu</pkg> instead of the bundled version</flag> <flag name="system-ssl">Use system OpenSSL instead of the bundled one</flag> <flag name="systemtap">Enable SystemTAP/DTrace tracing</flag> </use> diff --git a/net-libs/nodejs/nodejs-14.14.0.ebuild b/net-libs/nodejs/nodejs-14.15.0.ebuild similarity index 83% rename from net-libs/nodejs/nodejs-14.14.0.ebuild rename to net-libs/nodejs/nodejs-14.15.0.ebuild index f6e7a717189..6c9a27f20e6 100644 --- a/net-libs/nodejs/nodejs-14.14.0.ebuild +++ b/net-libs/nodejs/nodejs-14.15.0.ebuild @@ -2,57 +2,52 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) + +PYTHON_COMPAT=( python3_{7..9} ) PYTHON_REQ_USE="threads(+)" -inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils + +inherit bash-completion-r1 flag-o-matic python-any-r1 toolchain-funcs xdg-utils DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" HOMEPAGE="https://nodejs.org/"; -SRC_URI=" - https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz -" +SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"; LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" -SLOT="0" +SLOT="0/$(ver_cut 1)" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos" -IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test" -REQUIRED_USE=" - inspector? ( icu ssl ) + +IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm +snapshot +ssl system-icu +system-ssl systemtap test" +REQUIRED_USE="inspector? ( icu ssl ) npm? ( ssl ) - system-ssl? ( ssl ) -" + system-icu? ( icu ) + system-ssl? ( ssl )" -RDEPEND=" - >=app-arch/brotli-1.0.9 +# FIXME: test-fs-mkdir fails with "no such file or directory". Investigate. +RESTRICT="test" + +RDEPEND=">=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.16.1 >=net-libs/nghttp2-1.41.0 sys-libs/zlib - icu? ( >=dev-libs/icu-67:= ) - system-ssl? ( >=dev-libs/openssl-1.1.1:0= ) -" -BDEPEND=" - ${PYTHON_DEPS} + system-icu? ( >=dev-libs/icu-67:= ) + system-ssl? ( >=dev-libs/openssl-1.1.1:0= )" +BDEPEND="${PYTHON_DEPS} sys-apps/coreutils systemtap? ( dev-util/systemtap ) - test? ( net-misc/curl ) - pax_kernel? ( sys-apps/elfix ) -" -DEPEND=" - ${RDEPEND} -" + test? ( net-misc/curl )" +DEPEND="${RDEPEND}" + PATCHES=( "${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch + "${FILESDIR}"/${PN}-14.15.0-fix_ppc64_crashes.patch ) -RESTRICT="test" + S="${WORKDIR}/node-v${PV}" pkg_pretend() { (use x86 && ! use cpu_flags_x86_sse2) && \ die "Your CPU doesn't support the required SSE2 instruction." - - ( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \ - die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer." } src_prepare() { @@ -90,9 +85,6 @@ src_prepare() { BUILDTYPE=Debug fi - # We need to disable mprotect on two files when it builds Bug 694100. - use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch ) - default } @@ -107,7 +99,13 @@ src_configure() { --shared-zlib ) use debug && myconf+=( --debug ) - use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none ) + if use system-icu; then + myconf+=( --with-intl=system-icu ) + elif use icu; then + myconf+=( --with-intl=full-icu ) + else + myconf+=( --with-intl=none ) + fi use inspector || myconf+=( --without-inspector ) use npm || myconf+=( --without-npm ) use snapshot || myconf+=( --without-node-snapshot ) @@ -146,8 +144,6 @@ src_install() { local LIBDIR="${ED}/usr/$(get_libdir)" default - pax-mark -m "${ED}"/usr/bin/node - # set up a symlink structure that node-gyp expects.. dodir /usr/include/node/deps/{v8,uv} dosym . /usr/include/node/src
