diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-06-20 12:33:07 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-06-20 12:33:07 +0200 |
commit | c8aa4b10b2ab341bbcb163d041c44c1a20172ee1 (patch) | |
tree | 773f4205905ac2dd2fbc1c12ab45a06bedbcbafd /meta-oe | |
parent | c47471a1776d8616b5e4874e238a03c6f9feac08 (diff) | |
download | meta-openembedded-c8aa4b10b2ab341bbcb163d041c44c1a20172ee1.tar.gz |
Revert "nodejs: upgrade to 0.10.4"
This reverts commit 903e7131ba5225b085cd612199e88697f2e9e493.
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-devtools/nodejs/nodejs/0001-gcc-has-a-builtin-define-to-denote-hard-abi-when-in-.patch | 60 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb (renamed from meta-oe/recipes-devtools/nodejs/nodejs_0.10.4.bb) | 10 |
2 files changed, 65 insertions, 5 deletions
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-gcc-has-a-builtin-define-to-denote-hard-abi-when-in-.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-gcc-has-a-builtin-define-to-denote-hard-abi-when-in-.patch new file mode 100644 index 000000000..6268d6940 --- /dev/null +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-gcc-has-a-builtin-define-to-denote-hard-abi-when-in-.patch | |||
@@ -0,0 +1,60 @@ | |||
1 | From bf701e7cb3616631a354ed9ecbed6dd16f60c60d Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
3 | Date: Wed, 30 Jan 2013 10:43:47 +0100 | ||
4 | Subject: [PATCH] gcc has a builtin define to denote hard abi when in use, e.g. | ||
5 | when using -mfloat-abi=hard it will define __ARM_PCS_VFP to 1 and therefore | ||
6 | we should check that to determine which calling convention is in use and not | ||
7 | __VFP_FP__ which merely indicates presence of VFP unit | ||
8 | |||
9 | The fix has been provided by Khem Raj <raj.khem@gmail.com> | ||
10 | |||
11 | Upstream-Status: Forwarded | ||
12 | |||
13 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
14 | --- | ||
15 | deps/v8/src/arm/assembler-arm.cc | 4 ++-- | ||
16 | deps/v8/src/platform-linux.cc | 4 ++-- | ||
17 | 2 files changed, 4 insertions(+), 4 deletions(-) | ||
18 | |||
19 | diff --git a/deps/v8/src/arm/assembler-arm.cc b/deps/v8/src/arm/assembler-arm.cc | ||
20 | index 1787d15..c64ef58 100644 | ||
21 | --- a/deps/v8/src/arm/assembler-arm.cc | ||
22 | +++ b/deps/v8/src/arm/assembler-arm.cc | ||
23 | @@ -71,10 +71,10 @@ static unsigned CpuFeaturesImpliedByCompiler() { | ||
24 | // If the compiler is allowed to use VFP then we can use VFP too in our code | ||
25 | // generation even when generating snapshots. ARMv7 and hardware floating | ||
26 | // point support implies VFPv3, see ARM DDI 0406B, page A1-6. | ||
27 | -#if defined(CAN_USE_ARMV7_INSTRUCTIONS) && defined(__VFP_FP__) \ | ||
28 | +#if defined(CAN_USE_ARMV7_INSTRUCTIONS) && defined(__ARM_PCS_VFP) \ | ||
29 | && !defined(__SOFTFP__) | ||
30 | answer |= 1u << VFP3 | 1u << ARMv7 | 1u << VFP2; | ||
31 | -#endif // defined(CAN_USE_ARMV7_INSTRUCTIONS) && defined(__VFP_FP__) | ||
32 | +#endif // defined(CAN_USE_ARMV7_INSTRUCTIONS) && defined(__ARM_PCS_VFP) | ||
33 | // && !defined(__SOFTFP__) | ||
34 | #endif // _arm__ | ||
35 | |||
36 | diff --git a/deps/v8/src/platform-linux.cc b/deps/v8/src/platform-linux.cc | ||
37 | index ed9eb79..10d1879 100644 | ||
38 | --- a/deps/v8/src/platform-linux.cc | ||
39 | +++ b/deps/v8/src/platform-linux.cc | ||
40 | @@ -170,7 +170,7 @@ bool OS::ArmCpuHasFeature(CpuFeature feature) { | ||
41 | // calling this will return 1.0 and otherwise 0.0. | ||
42 | static void ArmUsingHardFloatHelper() { | ||
43 | asm("mov r0, #0":::"r0"); | ||
44 | -#if defined(__VFP_FP__) && !defined(__SOFTFP__) | ||
45 | +#if defined(__ARM_PCS_VFP) && !defined(__SOFTFP__) | ||
46 | // Load 0x3ff00000 into r1 using instructions available in both ARM | ||
47 | // and Thumb mode. | ||
48 | asm("mov r1, #3":::"r1"); | ||
49 | @@ -195,7 +195,7 @@ static void ArmUsingHardFloatHelper() { | ||
50 | #else | ||
51 | asm("vmov d0, r0, r1"); | ||
52 | #endif // __thumb__ | ||
53 | -#endif // defined(__VFP_FP__) && !defined(__SOFTFP__) | ||
54 | +#endif // defined(__ARM_PCS_VFP) && !defined(__SOFTFP__) | ||
55 | asm("mov r1, #0":::"r1"); | ||
56 | } | ||
57 | |||
58 | -- | ||
59 | 1.8.1 | ||
60 | |||
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_0.10.4.bb b/meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb index 3d81ccfb3..ec9e4cf06 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_0.10.4.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb | |||
@@ -1,15 +1,15 @@ | |||
1 | DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript" | 1 | DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript" |
2 | HOMEPAGE = "http://nodejs.org" | 2 | HOMEPAGE = "http://nodejs.org" |
3 | # tools/wrk is under Apache-2.0 | 3 | LICENSE = "MIT & BSD" |
4 | LICENSE = "MIT & BSD & Apache-2.0" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=95a589a3257ab7dfe37d8a8379e3c72d" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=1b19aee7bf088151c559f3ec9f830b44" | ||
6 | 5 | ||
7 | DEPENDS = "openssl" | 6 | DEPENDS = "openssl" |
8 | 7 | ||
9 | SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz \ | 8 | SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz \ |
9 | file://0001-gcc-has-a-builtin-define-to-denote-hard-abi-when-in-.patch \ | ||
10 | " | 10 | " |
11 | SRC_URI[md5sum] = "a4554450864af89c4420c54349b62295" | 11 | SRC_URI[md5sum] = "25ed6aa5710ac46b867ff3f17a4da1d6" |
12 | SRC_URI[sha256sum] = "1c960d2822447a9e4f7c46b832ff05e86743033c6643d644975af1cbf6a44fb8" | 12 | SRC_URI[sha256sum] = "1d63dd42f9bd22f087585ddf80a881c6acbe1664891b1dda3b71306fe9ae00f9" |
13 | 13 | ||
14 | S = "${WORKDIR}/node-v${PV}" | 14 | S = "${WORKDIR}/node-v${PV}" |
15 | 15 | ||