Re: [oe] [meta-oe][PATCH 1/8] nodejs: add 0.8.18
On Wed, Apr 10, 2013 at 06:14:15PM +0200, Koen Kooi wrote:
Signed-off-by: Koen Kooi k...@dominion.thruhere.net
Replying on first, because there isn't any cover letter :).
I've merged 1/8 (from previous version with fix for dash and dropped
RDEPENDS_virtclass-native), 7/8 and 8/8 (2/8 was already there)
3/8, 4/8, 5/8 have some feedback and 6/8 depends on 5/8 afaik
Now jenkins is running another clean build for PN-systemd removal..
---
...uiltin-define-to-denote-hard-abi-when-in-.patch | 60
++
meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb | 42 +++
2 files changed, 102 insertions(+)
create mode 100644
meta-oe/recipes-devtools/nodejs/nodejs/0001-gcc-has-a-builtin-define-to-denote-hard-abi-when-in-.patch
create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb
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 000..6268d69
--- /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 @@
+From bf701e7cb3616631a354ed9ecbed6dd16f60c60d Mon Sep 17 00:00:00 2001
+From: Koen Kooi k...@dominion.thruhere.net
+Date: Wed, 30 Jan 2013 10:43:47 +0100
+Subject: [PATCH] gcc has a builtin define to denote hard abi when in use,
e.g.
+ when using -mfloat-abi=hard it will define __ARM_PCS_VFP to 1 and therefore
+ we should check that to determine which calling convention is in use and not
+ __VFP_FP__ which merely indicates presence of VFP unit
+
+The fix has been provided by Khem Raj raj.k...@gmail.com
+
+Upstream-Status: Forwarded
+
+Signed-off-by: Koen Kooi k...@dominion.thruhere.net
+---
+ deps/v8/src/arm/assembler-arm.cc | 4 ++--
+ deps/v8/src/platform-linux.cc| 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/deps/v8/src/arm/assembler-arm.cc
b/deps/v8/src/arm/assembler-arm.cc
+index 1787d15..c64ef58 100644
+--- a/deps/v8/src/arm/assembler-arm.cc
b/deps/v8/src/arm/assembler-arm.cc
+@@ -71,10 +71,10 @@ static unsigned CpuFeaturesImpliedByCompiler() {
+ // If the compiler is allowed to use VFP then we can use VFP too in our
code
+ // generation even when generating snapshots. ARMv7 and hardware floating
+ // point support implies VFPv3, see ARM DDI 0406B, page A1-6.
+-#if defined(CAN_USE_ARMV7_INSTRUCTIONS) defined(__VFP_FP__) \
++#if defined(CAN_USE_ARMV7_INSTRUCTIONS) defined(__ARM_PCS_VFP) \
+ !defined(__SOFTFP__)
+ answer |= 1u VFP3 | 1u ARMv7 | 1u VFP2;
+-#endif // defined(CAN_USE_ARMV7_INSTRUCTIONS) defined(__VFP_FP__)
++#endif // defined(CAN_USE_ARMV7_INSTRUCTIONS) defined(__ARM_PCS_VFP)
+ // !defined(__SOFTFP__)
+ #endif // _arm__
+
+diff --git a/deps/v8/src/platform-linux.cc b/deps/v8/src/platform-linux.cc
+index ed9eb79..10d1879 100644
+--- a/deps/v8/src/platform-linux.cc
b/deps/v8/src/platform-linux.cc
+@@ -170,7 +170,7 @@ bool OS::ArmCpuHasFeature(CpuFeature feature) {
+ // calling this will return 1.0 and otherwise 0.0.
+ static void ArmUsingHardFloatHelper() {
+ asm(mov r0, #0:::r0);
+-#if defined(__VFP_FP__) !defined(__SOFTFP__)
++#if defined(__ARM_PCS_VFP) !defined(__SOFTFP__)
+ // Load 0x3ff0 into r1 using instructions available in both ARM
+ // and Thumb mode.
+ asm(mov r1, #3:::r1);
+@@ -195,7 +195,7 @@ static void ArmUsingHardFloatHelper() {
+ #else
+ asm(vmov d0, r0, r1);
+ #endif // __thumb__
+-#endif // defined(__VFP_FP__) !defined(__SOFTFP__)
++#endif // defined(__ARM_PCS_VFP) !defined(__SOFTFP__)
+ asm(mov r1, #0:::r1);
+ }
+
+--
+1.8.1
+
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb
b/meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb
new file mode 100644
index 000..4c4a18c
--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb
@@ -0,0 +1,42 @@
+DESCRIPTION = nodeJS Evented I/O for V8 JavaScript
+HOMEPAGE = http://nodejs.org;
+LICENSE = MIT BSD
+LIC_FILES_CHKSUM = file://LICENSE;md5=95a589a3257ab7dfe37d8a8379e3c72d
+
+DEPENDS = openssl
+
+SRC_URI = http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz \
+
file://0001-gcc-has-a-builtin-define-to-denote-hard-abi-when-in-.patch \
+
+SRC_URI[md5sum] = 25ed6aa5710ac46b867ff3f17a4da1d6
+SRC_URI[sha256sum] =
1d63dd42f9bd22f087585ddf80a881c6acbe1664891b1dda3b71306fe9ae00f9
+
+S = ${WORKDIR}/node-v${PV}
+
+# v8 errors out if you have set CCACHE
+CCACHE =
+
+ARCHFLAGS_arm = ${@bb.utils.contains('TUNE_FEATURES',
'callconvention-hard', '--with-arm-float-abi=hard',
'--with-arm-float-abi=softfp', d)}
+ARCHFLAGS ?=
+
+# Node is way too cool to use proper autotools, so we install two wrappers
to forcefully inject proper arch cflags to workaround gypi
+do_configure () {
+
Re: [oe] [meta-oe][PATCH 1/8] nodejs: add 0.8.18
Op 11 apr. 2013, om 11:47 heeft Martin Jansa martin.ja...@gmail.com het
volgende geschreven:
On Wed, Apr 10, 2013 at 06:14:15PM +0200, Koen Kooi wrote:
Signed-off-by: Koen Kooi k...@dominion.thruhere.net
Replying on first, because there isn't any cover letter :).
I've merged 1/8 (from previous version with fix for dash and dropped
RDEPENDS_virtclass-native), 7/8 and 8/8 (2/8 was already there)
3/8, 4/8, 5/8 have some feedback and 6/8 depends on 5/8 afaik
Hmm, I sent v2 yesterday, but it seems the list rejected them, resending those.
Then I'll rebase and look at v3
Now jenkins is running another clean build for PN-systemd removal..
---
...uiltin-define-to-denote-hard-abi-when-in-.patch | 60
++
meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb | 42 +++
2 files changed, 102 insertions(+)
create mode 100644
meta-oe/recipes-devtools/nodejs/nodejs/0001-gcc-has-a-builtin-define-to-denote-hard-abi-when-in-.patch
create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb
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 000..6268d69
--- /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 @@
+From bf701e7cb3616631a354ed9ecbed6dd16f60c60d Mon Sep 17 00:00:00 2001
+From: Koen Kooi k...@dominion.thruhere.net
+Date: Wed, 30 Jan 2013 10:43:47 +0100
+Subject: [PATCH] gcc has a builtin define to denote hard abi when in use,
e.g.
+ when using -mfloat-abi=hard it will define __ARM_PCS_VFP to 1 and therefore
+ we should check that to determine which calling convention is in use and
not
+ __VFP_FP__ which merely indicates presence of VFP unit
+
+The fix has been provided by Khem Raj raj.k...@gmail.com
+
+Upstream-Status: Forwarded
+
+Signed-off-by: Koen Kooi k...@dominion.thruhere.net
+---
+ deps/v8/src/arm/assembler-arm.cc | 4 ++--
+ deps/v8/src/platform-linux.cc| 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/deps/v8/src/arm/assembler-arm.cc
b/deps/v8/src/arm/assembler-arm.cc
+index 1787d15..c64ef58 100644
+--- a/deps/v8/src/arm/assembler-arm.cc
b/deps/v8/src/arm/assembler-arm.cc
+@@ -71,10 +71,10 @@ static unsigned CpuFeaturesImpliedByCompiler() {
+ // If the compiler is allowed to use VFP then we can use VFP too in our
code
+ // generation even when generating snapshots. ARMv7 and hardware floating
+ // point support implies VFPv3, see ARM DDI 0406B, page A1-6.
+-#if defined(CAN_USE_ARMV7_INSTRUCTIONS) defined(__VFP_FP__) \
++#if defined(CAN_USE_ARMV7_INSTRUCTIONS) defined(__ARM_PCS_VFP) \
+ !defined(__SOFTFP__)
+ answer |= 1u VFP3 | 1u ARMv7 | 1u VFP2;
+-#endif // defined(CAN_USE_ARMV7_INSTRUCTIONS) defined(__VFP_FP__)
++#endif // defined(CAN_USE_ARMV7_INSTRUCTIONS) defined(__ARM_PCS_VFP)
+ // !defined(__SOFTFP__)
+ #endif // _arm__
+
+diff --git a/deps/v8/src/platform-linux.cc b/deps/v8/src/platform-linux.cc
+index ed9eb79..10d1879 100644
+--- a/deps/v8/src/platform-linux.cc
b/deps/v8/src/platform-linux.cc
+@@ -170,7 +170,7 @@ bool OS::ArmCpuHasFeature(CpuFeature feature) {
+ // calling this will return 1.0 and otherwise 0.0.
+ static void ArmUsingHardFloatHelper() {
+ asm(mov r0, #0:::r0);
+-#if defined(__VFP_FP__) !defined(__SOFTFP__)
++#if defined(__ARM_PCS_VFP) !defined(__SOFTFP__)
+ // Load 0x3ff0 into r1 using instructions available in both ARM
+ // and Thumb mode.
+ asm(mov r1, #3:::r1);
+@@ -195,7 +195,7 @@ static void ArmUsingHardFloatHelper() {
+ #else
+ asm(vmov d0, r0, r1);
+ #endif // __thumb__
+-#endif // defined(__VFP_FP__) !defined(__SOFTFP__)
++#endif // defined(__ARM_PCS_VFP) !defined(__SOFTFP__)
+ asm(mov r1, #0:::r1);
+ }
+
+--
+1.8.1
+
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb
b/meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb
new file mode 100644
index 000..4c4a18c
--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb
@@ -0,0 +1,42 @@
+DESCRIPTION = nodeJS Evented I/O for V8 JavaScript
+HOMEPAGE = http://nodejs.org;
+LICENSE = MIT BSD
+LIC_FILES_CHKSUM = file://LICENSE;md5=95a589a3257ab7dfe37d8a8379e3c72d
+
+DEPENDS = openssl
+
+SRC_URI = http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz \
+
file://0001-gcc-has-a-builtin-define-to-denote-hard-abi-when-in-.patch \
+
+SRC_URI[md5sum] = 25ed6aa5710ac46b867ff3f17a4da1d6
+SRC_URI[sha256sum] =
1d63dd42f9bd22f087585ddf80a881c6acbe1664891b1dda3b71306fe9ae00f9
+
+S = ${WORKDIR}/node-v${PV}
+
+# v8 errors out if you have set CCACHE
+CCACHE =
+
+ARCHFLAGS_arm = ${@bb.utils.contains('TUNE_FEATURES',
'callconvention-hard',
