snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Activity

nodejs: add missing patch

This commit is contained in:
Enno Boland 2015-08-19 15:55:29 +02:00
parent 1870702faf
commit 3fda9360b3
2 changed files with 70 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
srcpkgs/nodejs/patches/arm.patch Normal file
View File

@ -0,0 +1,69 @@
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_;

2
srcpkgs/nodejs/template
View File

@ -1,7 +1,7 @@
# Template file for 'nodejs'
pkgname=nodejs
version=0.12.7
revision=3
revision=4
wrksrc=node-v${version}
hostmakedepends="pkg-config python"
makedepends="zlib-devel python-devel