diff options
| author | Andy Postnikov <apostnikov@gmail.com> | 2020-04-15 16:34:23 +0300 |
|---|---|---|
| committer | TBK <tbk@jjtc.eu> | 2020-04-17 09:20:20 +0000 |
| commit | 6b8aaffffc0b9669d884e07e5fd0d49680ba5ef3 (patch) | |
| tree | c5d10328af0129462eb4aedecf384f201b3ab953 /community/nodejs-current | |
| parent | 7c0d5cf7b63e6614e2016f621318d45601badecf (diff) | |
| download | aports-6b8aaffffc0b9669d884e07e5fd0d49680ba5ef3.tar.bz2 aports-6b8aaffffc0b9669d884e07e5fd0d49680ba5ef3.tar.xz | |
community/nodejs-current: unbundle brotli and port changes from main
Diffstat (limited to 'community/nodejs-current')
| -rw-r--r-- | community/nodejs-current/APKBUILD | 27 | ||||
| -rw-r--r-- | community/nodejs-current/unbundle-uv.patch | 10 |
2 files changed, 31 insertions, 6 deletions
diff --git a/community/nodejs-current/APKBUILD b/community/nodejs-current/APKBUILD index a1d0e69642..d5f4afb9b6 100644 --- a/community/nodejs-current/APKBUILD +++ b/community/nodejs-current/APKBUILD @@ -25,15 +25,23 @@ pkgname=nodejs-current # The current stable version, i.e. non-LTS. pkgver=13.12.0 -pkgrel=1 +pkgrel=2 pkgdesc="JavaScript runtime built on V8 engine - current stable version" url="https://nodejs.org/" arch="all !mips64 !mips64el" license="MIT" depends="ca-certificates" depends_dev="libuv" -makedepends="linux-headers python3 - zlib-dev libuv-dev openssl-dev c-ares-dev nghttp2-dev" +makedepends=" + brotli-dev + c-ares-dev + libuv-dev + linux-headers + nghttp2-dev + openssl-dev + python3 + zlib-dev + " subpackages="$pkgname-dev $pkgname-doc" provides="nodejs" replaces="nodejs nodejs-lts" # nodejs-lts for backward compatibility @@ -41,6 +49,7 @@ source="https://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz dont-run-gyp-files-for-bundled-deps.patch link-with-libatomic-on-mips32.patch elf.patch + unbundle-uv.patch " builddir="$srcdir/node-v$pkgver" @@ -48,16 +57,21 @@ prepare() { default_prepare # Remove bundled dependencies that we're not using. - rm -rf deps/cares deps/openssl deps/zlib + rm -rf deps/brotli deps/cares deps/openssl deps/uv deps/zlib } build() { + # Add defines recommended in libuv readme. + export CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" + export CXXFLAGS="$CXXFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" + case "$CARCH" in mips*) _carchflags="--with-mips-arch-variant=r1 --with-mips-float-abi=soft";; esac ./configure --prefix=/usr \ $_carchflags \ + --shared-brotli \ --shared-zlib \ --shared-libuv \ --shared-openssl \ @@ -66,7 +80,7 @@ build() { --without-npm \ --openssl-use-def-ca-store - make + make BUILDTYPE=Release } # TODO Run provided test suite. @@ -84,4 +98,5 @@ package() { sha512sums="18aa46e797e924b5d8f0c2585f10ce1c16b9b1958ad931e3790daab2dfe5b5c59fea7f33c23b7151de23b161b6a8eba8a338b9c9c5168d498871b9b100f63cff node-v13.12.0.tar.gz 940cc90aaa77a531cde13e31918a9978f9478936c3851038bcdf2869e64de03ce84dec5a46519469a90a8ba2853226825452d23d9347752abdbe04e944c083eb dont-run-gyp-files-for-bundled-deps.patch 9f60928b53447f9590c7065bcdbdd4065d10a06e8451531615791a3bd7d14f9114807e5446e0ec00e2cb7a11a277050345e34636b199db2979d7f022b31ffde4 link-with-libatomic-on-mips32.patch -ace818285ff0b868f17be64db7c7b77b314ba370fda6bac640d56bf18322a54fa015206a3e1adefa1d78ef66b597eebf10c28d6549005cd7e58f60a37c38b741 elf.patch" +ace818285ff0b868f17be64db7c7b77b314ba370fda6bac640d56bf18322a54fa015206a3e1adefa1d78ef66b597eebf10c28d6549005cd7e58f60a37c38b741 elf.patch +a4e1e7bd4f32ee30ebd319ac0c2fc751166f8fdd27f491709003dfebda51cbece9412630f0b98f0b85253ccc4f066c82997ad68abb9b87dc0b47c24d09a0643a unbundle-uv.patch" diff --git a/community/nodejs-current/unbundle-uv.patch b/community/nodejs-current/unbundle-uv.patch new file mode 100644 index 0000000000..38025e8c7e --- /dev/null +++ b/community/nodejs-current/unbundle-uv.patch @@ -0,0 +1,10 @@ +--- 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'] |