Commit 5caec516 authored by Jakub Jirutka's avatar Jakub Jirutka
Browse files

main/nodejs: build with bundled libuv

See explanation in the APKBUILD.

Ported from master (7429b08e).
parent 04da73a6
......@@ -62,11 +62,9 @@ url="https://nodejs.org/"
arch="all !mips64 !mips64el"
license="MIT"
depends="ca-certificates"
depends_dev="libuv"
makedepends="
brotli-dev
c-ares-dev
libuv-dev
linux-headers
nghttp2-dev
openssl-dev
......@@ -78,7 +76,6 @@ provides="nodejs-lts=$pkgver" # for backward compatibility
replaces="nodejs-current nodejs-lts" # nodejs-lts for backward compatibility
source="https://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz
dont-run-gyp-files-for-bundled-deps.patch
unbundle-uv.patch
link-with-libatomic-on-mips32.patch
"
builddir="$srcdir/node-v$pkgver"
......@@ -87,7 +84,7 @@ prepare() {
default_prepare
# Remove bundled dependencies that we're not using.
rm -rf deps/brotli deps/cares deps/openssl deps/uv deps/zlib
rm -rf deps/brotli deps/cares deps/openssl deps/zlib
}
build() {
......@@ -99,11 +96,14 @@ build() {
mips*) _carchflags="--with-mips-arch-variant=r1 --with-mips-float-abi=soft";;
esac
# NOTE: We use bundled libuv because they don't care much about backward
# compatibility and it has happened several times in past that we
# couldn't upgrade nodejs package in stable branches to fix CVEs due to
# libuv incompatibility.
python3 configure.py --prefix=/usr \
$_carchflags \
--shared-brotli \
--shared-zlib \
--shared-libuv \
--shared-openssl \
--shared-cares \
--shared-nghttp2 \
......@@ -157,6 +157,5 @@ npm() {
}
sha512sums="2a3e7c11c26b461b597e4597a897307de253fda6d0266de1538332f247d16f74bb67ad58c768e9bdcd8a3de60c20cde4685aa094618429639a323533f03be3f1 node-v12.18.4.tar.gz
3c536776e2ecb5dc677bf711a09418085b3c5e931a6eaf647f47c28e194d5c6dec354d4e7a039a5805b30fc7e83140594851e18d9120f523eec2f93539eac4db dont-run-gyp-files-for-bundled-deps.patch
a4e1e7bd4f32ee30ebd319ac0c2fc751166f8fdd27f491709003dfebda51cbece9412630f0b98f0b85253ccc4f066c82997ad68abb9b87dc0b47c24d09a0643a unbundle-uv.patch
fc5848ced3e591e732b6a9af27679ca82f7605a4b2cd2f7eb6a411664b7c065892fb67a1db5aec7a26207582eecd8377476ed550c1dfb6c7917ba7babfa66a2d dont-run-gyp-files-for-bundled-deps.patch
a63b42c08b55139c1c363f6ba8aba9d85a0621b383ed514f7562cfa02f0cc290785d7cfe09892ac39962980d1b318957511f57b3f9b9d1fbc8704c0603597c9a link-with-libatomic-on-mips32.patch"
......@@ -14,7 +14,7 @@ Node.js 7.2.0
out/Makefile: config.gypi common.gypi node.gyp \
- deps/uv/uv.gyp deps/http_parser/http_parser.gyp deps/zlib/zlib.gyp \
+ deps/http_parser/http_parser.gyp \
+ deps/uv/uv.gyp deps/http_parser/http_parser.gyp \
tools/v8_gypfiles/toolchain.gypi tools/v8_gypfiles/features.gypi \
tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp
$(PYTHON) tools/gyp_node.py -f make
--- a/deps/uvwasi/uvwasi.gyp
+++ b/deps/uvwasi/uvwasi.gyp
@@ -16,7 +16,6 @@
'src/wasi_rights.c',
],
'dependencies': [
- '../uv/uv.gyp:libuv',
],
'direct_dependent_settings': {
'include_dirs': ['include']
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment