nodejs: update to 4.0.0.
This commit is contained in:
Enno Boland
parent
445f2b3388
commit
557f1bb5de
2 changed files with 11 additions and 91 deletions
|
|
@ -1,69 +0,0 @@
|
|||
diff --git deps/v8/build/toolchain.gypi deps/v8/build/toolchain.gypi
|
||||
index 1d47360..9c2e376 100644
|
||||
--- deps/v8/build/toolchain.gypi
|
||||
+++ deps/v8/build/toolchain.gypi
|
||||
@@ -159,7 +159,7 @@
|
||||
}],
|
||||
[ 'arm_version==7 or arm_version=="default"', {
|
||||
'conditions': [
|
||||
- [ 'arm_fpu!="default"', {
|
||||
+ [ 'arm_fpu!="default" and arm_fpu!=""', {
|
||||
'cflags': ['-mfpu=<(arm_fpu)',],
|
||||
}],
|
||||
],
|
||||
@@ -202,7 +202,7 @@
|
||||
}],
|
||||
[ 'arm_version==7 or arm_version=="default"', {
|
||||
'conditions': [
|
||||
- [ 'arm_fpu!="default"', {
|
||||
+ [ 'arm_fpu!="default" and arm_fpu!=""', {
|
||||
'cflags': ['-mfpu=<(arm_fpu)',],
|
||||
}],
|
||||
],
|
||||
diff --git deps/v8/src/base/cpu.cc deps/v8/src/base/cpu.cc
|
||||
index adce69d..3f35a08 100644
|
||||
--- deps/v8/src/base/cpu.cc
|
||||
+++ deps/v8/src/base/cpu.cc
|
||||
@@ -365,7 +365,7 @@ CPU::CPU() : stepping_(0),
|
||||
//
|
||||
// See http://code.google.com/p/android/issues/detail?id=10812
|
||||
//
|
||||
- // We try to correct this by looking at the 'elf_format'
|
||||
+ // We try to correct this by looking at the 'elf_platform'
|
||||
// field reported by the 'Processor' field, which is of the
|
||||
// form of "(v7l)" for an ARMv7-based CPU, and "(v6l)" for
|
||||
// an ARMv6-one. For example, the Raspberry Pi is one popular
|
||||
@@ -377,6 +377,17 @@ CPU::CPU() : stepping_(0),
|
||||
}
|
||||
delete[] processor;
|
||||
}
|
||||
+
|
||||
+ // elf_platform moved to the model name field in Linux v3.8.
|
||||
+ if (architecture_ == 7) {
|
||||
+ char* processor = cpu_info.ExtractField("model name");
|
||||
+ if (HasListItem(processor, "(v6l)")) {
|
||||
+ architecture_ = 6;
|
||||
+ } else if (HasListItem(processor, "(v5t)")) {
|
||||
+ architecture_ = 5;
|
||||
+ }
|
||||
+ delete[] processor;
|
||||
+ }
|
||||
}
|
||||
|
||||
// Try to extract the list of CPU features from ELF hwcaps.
|
||||
@@ -427,6 +438,15 @@ CPU::CPU() : stepping_(0),
|
||||
architecture_ = 6;
|
||||
}
|
||||
|
||||
+ if (architecture_ < 6) {
|
||||
+ architecture_ = 5;
|
||||
+ has_thumb2_ = false;
|
||||
+ has_vfp_ = false;
|
||||
+ has_vfp3_ = false;
|
||||
+ has_vfp3_d32_ = false;
|
||||
+ has_neon_ = false;
|
||||
+ }
|
||||
+
|
||||
// We don't support any FPUs other than VFP.
|
||||
has_fpu_ = has_vfp_;
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'nodejs'
|
||||
pkgname=nodejs
|
||||
version=0.12.7
|
||||
revision=4
|
||||
version=4.0.0
|
||||
revision=1
|
||||
wrksrc=node-v${version}
|
||||
hostmakedepends="pkg-config python"
|
||||
makedepends="zlib-devel python-devel
|
||||
|
|
@ -13,13 +13,12 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
|||
license="MIT"
|
||||
homepage="http://nodejs.org/"
|
||||
distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
|
||||
checksum=b23d64df051c9c969b0c583f802d5d71de342e53067127a5061415be7e12f39d
|
||||
|
||||
checksum=e110e5a066f3a6fe565ede7dd66f3727384b9b5c5fbf46f8db723d726e2f5900
|
||||
build_options="ssl libuv http_parser"
|
||||
desc_option_libuv="Enable shared libuv"
|
||||
desc_option_http_parser="Enable shared http-parser"
|
||||
|
||||
build_options_default="ssl libuv http_parser"
|
||||
# broken with libressl, use bundled openssl instead
|
||||
build_options_default="libuv http_parser"
|
||||
|
||||
do_configure() {
|
||||
local _args
|
||||
|
|
@ -27,34 +26,24 @@ do_configure() {
|
|||
export LD="$CXX"
|
||||
if [ "$CROSS_BUILD" ]; then
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
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" ;;
|
||||
arm*) _args="--dest-cpu=arm --without-snapshot" ;;
|
||||
*) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}\n" ;;
|
||||
esac
|
||||
fi
|
||||
./configure --prefix=/usr --shared-zlib \
|
||||
$(vopt_if http_parser --shared-http-parser) \
|
||||
$(vopt_if ssl --openssl-use-sys) \
|
||||
$(vopt_if ssl --shared-openssl) \
|
||||
$(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
|
||||
make LD="$CXX" ${makejobs} PORTABLE=1 V=1
|
||||
make LD="$CXX" LDFLAGS+=-ldl ${makejobs} PORTABLE=1 V=1
|
||||
else
|
||||
make LD="$CXX" ${makejobs} V=1
|
||||
make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1
|
||||
fi
|
||||
}
|
||||
do_install() {
|
||||
make LD="$CXX" DESTDIR="$DESTDIR" install
|
||||
make LD="$CXX" LDFLAGS+=-ldl DESTDIR="$DESTDIR" install
|
||||
vlicense LICENSE
|
||||
rm -r $DESTDIR/usr/include
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue