From 1870702faf01dbadd3d8a7e826d7ec90bca3ccdf Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 19 Aug 2015 14:59:16 +0200 Subject: [PATCH] nodejs: do not build for armv7 on armv6. fixes #2299 --- srcpkgs/nodejs/template | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template index cd5f65bb9ea..59ac0e9a334 100644 --- a/srcpkgs/nodejs/template +++ b/srcpkgs/nodejs/template @@ -1,7 +1,7 @@ # Template file for 'nodejs' pkgname=nodejs version=0.12.7 -revision=2 +revision=3 wrksrc=node-v${version} hostmakedepends="pkg-config python" makedepends="zlib-devel python-devel @@ -27,7 +27,12 @@ do_configure() { export LD="$CXX" if [ "$CROSS_BUILD" ]; then case "$XBPS_TARGET_MACHINE" in - arm*) _args="--dest-cpu=arm --without-snapshot" ;; + armv6*) + GYPFLAGS="-Darm_thumb -Darm_float_abi=hard -Darm_version=6 -Darm_fpu=vfpv2" + _args="--dest-cpu=arm --without-snapshot" ;; + armv7*) + GYPFLAGS="-Darm_thumb -Darm_float_abi=hard -Darm_version=7 -Darm_fpu=vfpv3-d16" + _args="--dest-cpu=arm --without-snapshot" ;; *) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}\n" ;; esac fi @@ -35,6 +40,12 @@ do_configure() { $(vopt_if http_parser --shared-http-parser) \ $(vopt_if ssl --openssl-use-sys) \ $(vopt_if libuv --shared-libuv) ${_args} + + if [ "$CROSS_BUILD" ]; then + case "$XBPS_TARGET_MACHINE" in + armv6*) sed -i 's/vfpv3/vfp/' config.gypi ;; + esac + fi } do_build() { if [ "$CROSS_BUILD" ]; then