commit: fd37af5f175f9afaaa691147a3e6335fac5a7cf5 Author: Marek Szuba <marecki <AT> gentoo <DOT> org> AuthorDate: Fri Aug 13 22:55:30 2021 +0000 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> CommitDate: Fri Aug 13 22:55:30 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd37af5f
net-libs/nodejs: do not purge unneeded bundled dependencies Turns out this breaks the install phase in at least v16. No idea how I've managed to get that one slip past my build testing - but there you go. Closes: https://bugs.gentoo.org/808063 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> net-libs/nodejs/nodejs-12.22.5.ebuild | 8 -------- net-libs/nodejs/nodejs-14.17.5.ebuild | 11 ----------- net-libs/nodejs/nodejs-16.6.2.ebuild | 11 ----------- profiles/package.mask | 5 ----- 4 files changed, 35 deletions(-) diff --git a/net-libs/nodejs/nodejs-12.22.5.ebuild b/net-libs/nodejs/nodejs-12.22.5.ebuild index 19fc9cce0e0..a8662cb49d0 100644 --- a/net-libs/nodejs/nodejs-12.22.5.ebuild +++ b/net-libs/nodejs/nodejs-12.22.5.ebuild @@ -88,14 +88,6 @@ src_prepare() { export V=1 export BUILDTYPE=Release - # There have been cases of other bundled deps bypassing --shared-foo / USE=system-bar, - # therefore play it safe and make sure dependencies which are not supposed to be bundled - # aren't there in the first place. - rm -r deps/{brotli,cares,nghttp2,uv,zlib} || die "Failed to remove undesired bundled deps" - if use system-ssl; then - rm -r deps/openssl || die "Failed to remoce bundled OpenSSL" - fi - # 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 diff --git a/net-libs/nodejs/nodejs-14.17.5.ebuild b/net-libs/nodejs/nodejs-14.17.5.ebuild index 14e49bf0eb0..d819d8b826f 100644 --- a/net-libs/nodejs/nodejs-14.17.5.ebuild +++ b/net-libs/nodejs/nodejs-14.17.5.ebuild @@ -81,17 +81,6 @@ src_prepare() { export V=1 export BUILDTYPE=Release - # There have been cases of other bundled deps bypassing --shared-foo / USE=system-bar, - # therefore play it safe and make sure dependencies which are not supposed to be bundled - # aren't there in the first place. - rm -r deps/{brotli,cares,nghttp2,uv,zlib} || die "Failed to remove undesired bundled deps" - if use system-icu; then - rm -r deps/icu-small || die "Failed to remove bundled ICU" - fi - if use system-ssl; then - rm -r deps/openssl || die "Failed to remoce bundled OpenSSL" - fi - # 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 diff --git a/net-libs/nodejs/nodejs-16.6.2.ebuild b/net-libs/nodejs/nodejs-16.6.2.ebuild index df3eeec96e6..44eb7d90f0a 100644 --- a/net-libs/nodejs/nodejs-16.6.2.ebuild +++ b/net-libs/nodejs/nodejs-16.6.2.ebuild @@ -73,17 +73,6 @@ src_prepare() { export V=1 export BUILDTYPE=Release - # There have been cases of other bundled deps bypassing --shared-foo / USE=system-bar, - # therefore play it safe and make sure dependencies which are not supposed to be bundled - # aren't there in the first place. - rm -r deps/{brotli,cares,nghttp2,uv,zlib} || die "Failed to remove undesired bundled deps" - if use system-icu; then - rm -r deps/icu-small || die "Failed to remove bundled ICU" - fi - if use system-ssl; then - rm -r deps/openssl || die "Failed to remoce bundled OpenSSL" - fi - # 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 diff --git a/profiles/package.mask b/profiles/package.mask index 33540076bcb..692ee5b10e3 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -32,11 +32,6 @@ #--- END OF EXAMPLES --- -# Sam James <[email protected]> (2021-08-13) -# Fails to build with make error in src_install phase. -# See bug #808063. -=net-libs/nodejs-16.6.2 - # David Seifert <[email protected]> (2021-08-13) # Dead upstream, new "forked" upstream that just added the last version # on Github but doesn't maintain them. Unmaintained for the past 10
