commit: 55d41af70c102c202b46f8568ab0b6c06da4b2f2 Author: William Hubbs <williamh <AT> gentoo <DOT> org> AuthorDate: Fri May 5 15:14:20 2023 +0000 Commit: William Hubbs <williamh <AT> gentoo <DOT> org> CommitDate: Fri May 5 15:16:14 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55d41af7
net-libs/nodejs: drop 14.21.3 Closes: https://bugs.gentoo.org/904878 Signed-off-by: William Hubbs <williamh <AT> gentoo.org> net-libs/nodejs/Manifest | 1 - .../nodejs/files/nodejs-13.8.0-paxmarking.patch | 111 ---------- .../files/nodejs-14.15.0-fix_ppc64_crashes.patch | 33 --- .../files/nodejs-14.19.0-global-npm-config.patch | 20 -- net-libs/nodejs/files/nodejs-gcc-13.patch | 27 --- net-libs/nodejs/nodejs-14.21.3.ebuild | 240 --------------------- 6 files changed, 432 deletions(-) diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest index c1e843f8bdd4..6207fbc0ee9b 100644 --- a/net-libs/nodejs/Manifest +++ b/net-libs/nodejs/Manifest @@ -1,4 +1,3 @@ -DIST node-v14.21.3.tar.xz 34508116 BLAKE2B 6fa001be10499ff2dfc920690dda9df25423f3e5c0bf19ae2ab9df571ca905e164e5a4eb778d0aa16a6026c354e39e063bde39d734a0532c3d95c937e509a9cb SHA512 bea8ccbb95ba00c220a42d30f8827fc94fb63725079dc3b63c65fd62d5f4f85d1d78e00b9b1f882a80449fa251930d3f3f5f9c8ae8d14d132660d4c4fd0b08f0 DIST node-v16.20.0.tar.xz 35546884 BLAKE2B 5bdb1fb7365e07f13d0a58a8d052d11efaadcf1b0792af0517b78b1ecf01e50eabe26e31588ae410ee63b7494a4eb9d23f70d4dd157a452d0bbf8bd548865255 SHA512 b155acdff0244307afcc334844f113b5c321f7764ebb69326d60a6a79d0e0d38d55257a38b815f5933aa4071e6a788e01c466476ef012cec648c84d74adda406 DIST node-v18.16.0.tar.xz 40467860 BLAKE2B b16749c0212f3aa196ec9fc0f999a023adeb9031b3332939330ba5a3edb5bc2ed6dc21bf861509696e19ed0cc5d5c54bb882018f0e54eb1ad8e9b0ba3bb64bff SHA512 608ce5db97ce2d851f381c7991f635c5e0927ae79037649b482c7e197479341b7c6560644e25f4d65ece8aa80c5763a0e044349a5be210fa33fbbf97a96462bd DIST node-v20.0.0.tar.xz 41279796 BLAKE2B 1df8785ca22dea15c6c1f19ec2d3b3d704f9cda6cf13d6e8e8fbbf853515871f18a11a4bbe5ed765434f6f5606975c5254e1826f2e506165ff937ef16d326262 SHA512 cda981227398c1a9023a2212c0d5351eadfedd19d58776dcc470e3ba0213a178b626c37d48fa52548ddd5a70d26a18b66c266856321a0af9ada2b1eac7ee9fd8 diff --git a/net-libs/nodejs/files/nodejs-13.8.0-paxmarking.patch b/net-libs/nodejs/files/nodejs-13.8.0-paxmarking.patch deleted file mode 100644 index 8dbf5f43d486..000000000000 --- a/net-libs/nodejs/files/nodejs-13.8.0-paxmarking.patch +++ /dev/null @@ -1,111 +0,0 @@ - Bug: 694100 - Add actions for pax marking mkcodecache, node_mksnapshot and mksnapshot - to disable mprotect for pax enable kernel. - Reported-by: Attila Tóth <[email protected]> - Co-developed-by: Attila Tóth <[email protected]> - Signed-off-by: Magnus Granberg <[email protected]> - ---- a/node.gyp 2019-10-23 11:52:41.000000000 +0200 -+++ b/node.gyp 2019-11-12 20:58:43.957881862 +0100 -@@ -233,7 +233,9 @@ - 'deps/acorn-plugins/acorn-static-class-features/index.js', - ], - 'node_mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot<(EXECUTABLE_SUFFIX)', -+ 'node_mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot_u<(EXECUTABLE_SUFFIX)', - 'mkcodecache_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache<(EXECUTABLE_SUFFIX)', -+ 'mkcodecache_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache_u<(EXECUTABLE_SUFFIX)', - 'conditions': [ - [ 'node_shared=="true"', { - 'node_target_type%': 'shared_library', -@@ -436,10 +438,24 @@ - ], - 'actions': [ - { -+ 'action_name': 'run_pax_mkcodecache', -+ 'inputs': [ -+ '<(mkcodecache_exec)', -+ ], -+ 'outputs': [ -+ '<(mkcodecache_u_exec)', -+ ], -+ 'action': [ -+ 'bash', -+ '-c', -+ 'mv <(mkcodecache_exec) <(mkcodecache_u_exec) && paxmark.sh m <(mkcodecache_u_exec)', -+ ], -+ }, -+ { - 'action_name': 'run_mkcodecache', - 'process_outputs_as_sources': 1, - 'inputs': [ -- '<(mkcodecache_exec)', -+ '<(mkcodecache_u_exec)', - ], - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/node_code_cache.cc', -@@ -461,10 +477,24 @@ - ], - 'actions': [ - { -+ 'action_name': 'run_pax_mksnapshot', -+ 'inputs': [ -+ '<(node_mksnapshot_exec)', -+ ], -+ 'outputs': [ -+ '<(node_mksnapshot_u_exec)', -+ ], -+ 'action': [ -+ 'bash', -+ '-c', -+ 'mv <(node_mksnapshot_exec) <(node_mksnapshot_u_exec) && paxmark.sh m <(node_mksnapshot_u_exec)', -+ ], -+ }, -+ { - 'action_name': 'node_mksnapshot', - 'process_outputs_as_sources': 1, - 'inputs': [ -- '<(node_mksnapshot_exec)', -+ '<(node_mksnapshot_u_exec)', - ], - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc', ---- a/tools/v8_gypfiles/v8.gyp 2019-12-03 16:10:36.000000000 +0100 -+++ b/tools/v8_gypfiles/v8.gyp 2019-12-17 18:37:33.695839254 +0100 -@@ -9,6 +9,7 @@ - 'v8_vector_stores%': 0, - 'v8_embed_script%': "", - 'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)', -+ 'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)', - 'v8_os_page_size%': 0, - 'generate_bytecode_output_root': '<(SHARED_INTERMEDIATE_DIR)/generate-bytecode-output-root', - 'generate_bytecode_builtins_list_output': '<(generate_bytecode_output_root)/builtins-generated/bytecodes-builtins-list.h', -@@ -427,6 +425,20 @@ - }, - 'actions': [ - { -+ 'action_name': 'run_pax_mksnapshot', -+ 'inputs': [ -+ '<(mksnapshot_exec)', -+ ], -+ 'outputs': [ -+ '<(mksnapshot_u_exec)', -+ ], -+ 'action': [ -+ 'bash', -+ '-c', -+ 'mv <(mksnapshot_exec) <(mksnapshot_u_exec) && paxmark.sh m <(mksnapshot_u_exec)', -+ ], -+ }, -+ { - 'action_name': 'run_mksnapshot', - 'message': 'generating: >@(_outputs)', - 'variables': { -@@ -442,7 +454,7 @@ - ], - }, - 'inputs': [ -- '<(mksnapshot_exec)', -+ '<(mksnapshot_u_exec)', - ], - 'outputs': ["<(INTERMEDIATE_DIR)/snapshot.cc"], - 'process_outputs_as_sources': 1, 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 deleted file mode 100644 index c9c01843cd63..000000000000 --- a/net-libs/nodejs/files/nodejs-14.15.0-fix_ppc64_crashes.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- 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/files/nodejs-14.19.0-global-npm-config.patch b/net-libs/nodejs/files/nodejs-14.19.0-global-npm-config.patch deleted file mode 100644 index 09d9dbe47be0..000000000000 --- a/net-libs/nodejs/files/nodejs-14.19.0-global-npm-config.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/deps/npm/lib/config/core.js b/deps/npm/lib/config/core.js -index 36420b3450..0afb0b6792 100644 ---- a/deps/npm/lib/config/core.js -+++ b/deps/npm/lib/config/core.js -@@ -151,11 +151,10 @@ function load_ (builtin, rc, cli, cb) { - // Eg, `npm config get globalconfig --prefix ~/local` should - // return `~/local/etc/npmrc` - // annoying humans and their expectations! -- if (conf.get('prefix')) { -- var etc = path.resolve(conf.get('prefix'), 'etc') -- defaults.globalconfig = path.resolve(etc, 'npmrc') -- defaults.globalignorefile = path.resolve(etc, 'npmignore') -- } -+ // gentoo deviates wrt global config; store in /etc/npm -+ var globalconfig = path.resolve('/etc', 'npm') -+ defaults.globalconfig = path.resolve(globalconfig, 'npmrc') -+ defaults.globalignorefile = path.resolve(globalconfig, 'npmignore') - - conf.addFile(conf.get('globalconfig'), 'global') - diff --git a/net-libs/nodejs/files/nodejs-gcc-13.patch b/net-libs/nodejs/files/nodejs-gcc-13.patch deleted file mode 100644 index 13427a6b7407..000000000000 --- a/net-libs/nodejs/files/nodejs-gcc-13.patch +++ /dev/null @@ -1,27 +0,0 @@ -https://chromium-review.googlesource.com/c/v8/v8/+/3934140 -adjusted to layout of the node project -From: WANG Xuerui <[email protected]> -Date: Tue, 4 Oct 2022 17:21:03 +0800 -Subject: [PATCH] [base] Fix build with gcc-13 - -See https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes. ---- a/deps/v8/src/base/logging.h -+++ b/deps/v8/src/base/logging.h -@@ -5,6 +5,7 @@ - #ifndef V8_BASE_LOGGING_H_ - #define V8_BASE_LOGGING_H_ - -+#include <cstdint> - #include <cstring> - #include <sstream> - #include <string> ---- a/deps/v8/src/inspector/v8-string-conversions.h -+++ b/deps/v8/src/inspector/v8-string-conversions.h -@@ -5,6 +5,7 @@ - #ifndef V8_INSPECTOR_V8_STRING_CONVERSIONS_H_ - #define V8_INSPECTOR_V8_STRING_CONVERSIONS_H_ - -+#include <cstdint> - #include <string> - - // Conversion routines between UT8 and UTF16, used by string-16.{h,cc}. You may diff --git a/net-libs/nodejs/nodejs-14.21.3.ebuild b/net-libs/nodejs/nodejs-14.21.3.ebuild deleted file mode 100644 index d58d6df5cedf..000000000000 --- a/net-libs/nodejs/nodejs-14.21.3.ebuild +++ /dev/null @@ -1,240 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CONFIG_CHECK="~ADVISE_SYSCALLS" -PYTHON_COMPAT=( python3_{9..10} ) -PYTHON_REQ_USE="threads(+)" - -inherit bash-completion-r1 flag-o-matic linux-info pax-utils python-any-r1 toolchain-funcs xdg-utils - -DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine" -HOMEPAGE="https://nodejs.org/"; -LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/nodejs/node"; - SLOT="0" -else - SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"; - SLOT="0/$(ver_cut 1)" - KEYWORDS="amd64 arm arm64 ppc64 -riscv x86 ~amd64-linux ~x64-macos" - S="${WORKDIR}/node-v${PV}" -fi - -IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test" -REQUIRED_USE="inspector? ( icu ssl ) - npm? ( ssl ) - system-icu? ( icu ) - system-ssl? ( ssl )" - -RESTRICT="!test? ( test )" - -RDEPEND=">=app-arch/brotli-1.0.9:= - >=dev-libs/libuv-1.40.0:= - >=net-dns/c-ares-1.17.2:= - >=net-libs/nghttp2-1.41.0:= - sys-libs/zlib - system-icu? ( >=dev-libs/icu-67:= ) - system-ssl? ( - >=dev-libs/openssl-1.1.1:0= - <dev-libs/openssl-3.0.0_beta1:0= - ) - sys-devel/gcc:*" -BDEPEND="${PYTHON_DEPS} - sys-apps/coreutils - virtual/pkgconfig - systemtap? ( dev-util/systemtap ) - test? ( net-misc/curl ) - pax-kernel? ( sys-apps/elfix )" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-14.15.0-fix_ppc64_crashes.patch - "${FILESDIR}"/${PN}-14.19.0-global-npm-config.patch - "${FILESDIR}"/${PN}-gcc-13.patch -) - -pkg_pretend() { - (use x86 && ! use cpu_flags_x86_sse2) && \ - die "Your CPU doesn't support the required SSE2 instruction." -} - -pkg_setup() { - python-any-r1_pkg_setup - linux-info_pkg_setup -} - -src_prepare() { - tc-export AR CC CXX PKG_CONFIG - export V=1 - export BUILDTYPE=Release - - # fix compilation on Darwin - # https://code.google.com/p/gyp/issues/detail?id=260 - sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die - - # less verbose install output (stating the same as portage, basically) - sed -i -e "/print/d" tools/install.py || die - - # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 - local LIBDIR=$(get_libdir) - sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die - sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die - - # Avoid writing a depfile, not useful - sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die - - sed -i -e "/'-O3'/d" common.gypi node.gypi || die - - # debug builds. change install path, remove optimisations and override buildtype - if use debug; then - sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die - 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 ) - - # All this test does is check if the npm CLI produces warnings of any sort, - # failing if it does. Overkill, much? Especially given one possible warning - # is that there is a newer version of npm available upstream (yes, it does - # use the network if available), thus making it a real possibility for this - # test to begin failing one day even though it was fine before. - rm -f test/parallel/test-release-npm.js - - default -} - -src_configure() { - xdg_environment_reset - - # LTO compiler flags are handled by configure.py itself - filter-flags '-flto*' - # nodejs unconditionally links to libatomic #869992 - # specifically it requires __atomic_is_lock_free which - # is not yet implemented by sys-libs/compiler-rt (see - # https://reviews.llvm.org/D85044?id=287068), therefore - # we depend on gcc and force using libgcc as the support lib - tc-is-clang && append-ldflags "--rtlib=libgcc --unwindlib=libgcc" - - local myconf=( - --shared-brotli - --shared-cares - --shared-libuv - --shared-nghttp2 - --shared-zlib - ) - use debug && myconf+=( --debug ) - use lto && myconf+=( --enable-lto ) - 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 ) - if use ssl; then - use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) - else - myconf+=( --without-ssl ) - fi - - local myarch="" - case ${ABI} in - amd64) myarch="x64";; - arm) myarch="arm";; - arm64) myarch="arm64";; - ppc64) myarch="ppc64";; - x32) myarch="x32";; - x86) myarch="ia32";; - *) myarch="${ABI}";; - esac - - GYP_DEFINES="linux_use_gold_flags=0 - linux_use_bundled_binutils=0 - linux_use_bundled_gold=0" \ - "${EPYTHON}" configure.py \ - --prefix="${EPREFIX}"/usr \ - --dest-cpu=${myarch} \ - $(use_with systemtap dtrace) \ - "${myconf[@]}" || die -} - -src_compile() { - emake -C out -} - -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 - for var in deps/{uv,v8}/include; do - dosym ../.. /usr/include/node/${var} - done - - if use doc; then - docinto html - dodoc -r "${S}"/doc/* - fi - - if use npm; then - dodir /etc/npm - - # Install bash completion for `npm` - # We need to temporarily replace default config path since - # npm otherwise tries to write outside of the sandbox - local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js" - sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die - local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)" - "${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}" - newbashcomp "${tmp_npm_completion_file}" npm - sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die - - # Move man pages - doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/* - - # Clean up - rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} - rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} - - local find_exp="-or -name" - local find_name=() - for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \ - ".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \ - "*.md" "*.markdown" "*.bat" "*.cmd"; do - find_name+=( ${find_exp} "${match}" ) - done - - # Remove various development and/or inappropriate files and - # useless docs of dependend packages. - find "${LIBDIR}"/node_modules \ - \( -type d -name examples \) -or \( -type f \( \ - -iname "LICEN?E*" \ - "${find_name[@]}" \ - \) \) -exec rm -rf "{}" \; - fi - - mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die -} - -src_test() { - if has usersandbox ${FEATURES}; then - rm -f "${S}"/test/parallel/test-fs-mkdir.js - ewarn "You are emerging ${PN} with 'usersandbox' enabled. Excluding tests known to fail in this mode." \ - "For full test coverage, emerge =${CATEGORY}/${PF} with 'FEATURES=-usersandbox'." - fi - - out/${BUILDTYPE}/cctest || die - "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die -}
