Skip to content

Commit 1611a78

Browse files
author
Rasmus Thomsen
committed
nodejs: fix cross to aarch64
Also mark x86_64* -> arm* as broken, we can only build 32bit -> 32bit (i686 -> arm*) , see https://github.com/nodejs/node/blob/master/deps/v8/src/base/build_config.h#L149
1 parent 106ebe1 commit 1611a78

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

srcpkgs/nodejs/template

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
# Template file for 'nodejs'
22
pkgname=nodejs
33
version=10.15.0
4-
revision=1
4+
revision=2
55
wrksrc="node-v${version}"
6-
hostmakedepends="pkg-config python $(vopt_if icu icu)"
6+
# Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
7+
hostmakedepends="pkg-config python $(vopt_if icu icu-devel)
8+
$(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
9+
$(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
10+
$(vopt_if cares c-ares-devel)"
711
makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
812
$(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
913
$(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
@@ -13,7 +17,7 @@ maintainer="Enno Boland <[email protected]>"
1317
license="MIT"
1418
homepage="https://nodejs.org/"
1519
distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
16-
checksum=dbe467e3dabb6854fcb0cd96e04082268cb1e313ce97a4b7100b2ed152b0a0ab
20+
checksum=1ed31ba75080b16193f1c7a351807481b1f7da08bfaf7172bc07f0cf07e6ea71
1721

1822
build_options="ssl libuv http_parser icu nghttp2 cares"
1923
desc_option_ssl="Enable shared libressl"
@@ -31,12 +35,13 @@ provides="nodejs-runtime-0_1"
3135
do_configure() {
3236
local _args
3337

34-
export LD="$CXX"
38+
export LD="$CC"
39+
export LDXX="$CXX"
3540
if [ "$CROSS_BUILD" ]; then
3641
case "$XBPS_TARGET_MACHINE" in
37-
arm*) _args="--dest-cpu=arm --without-snapshot" ;;
42+
arm*) broken="Can only build Node for ARMv[5-7] from a 32-bit host" ;;
3843
aarch64*) _args="--dest-cpu=arm64 --without-snapshot" ;;
39-
*) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}\n" ;;
44+
*) broken="$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}\n" ;;
4045
esac
4146
fi
4247
./configure --prefix=/usr --shared-zlib \

0 commit comments

Comments
 (0)