nodejs: updated recipe to v0.2.6

PATCH Superseded AJ ONeal 4 participants 6 messages Feb 8, 2011 – Feb 10, 2011

Share & tools

AJ ONeal

author

2011-02-08 17:59 UTC #0 lore raw

PATCH v4 1/1 nodejs: updated recipe to v0.2.6

* added version number to patches
* libev-cross-cc_0.2.6.patch - turns off execution so that cross-compile succeeds
* node-cross-cc_0.2.6.patch - enables cross-compiling of v8 for x86, x86_64, arm, and mips

Signed-off-by AJ ONeal <[email protected]>

---
 recipes/nodejs/files/libev-cross-cc.patch       |   18 ------------
 recipes/nodejs/files/libev-cross-cc_0.2.6.patch |   13 +++++++++
 recipes/nodejs/files/node-cross-cc.patch        |   14 ---------
 recipes/nodejs/files/node-cross-cc_0.2.6.patch  |   19 +++++++++++++
 recipes/nodejs/nodejs_0.2.1.bb                  |   34 -----------------------
 recipes/nodejs/nodejs_0.2.6.bb                  |   32 +++++++++++++++++++++
 6 files changed, 64 insertions(+), 66 deletions(-)
 delete mode 100644 recipes/nodejs/files/libev-cross-cc.patch
 create mode 100644 recipes/nodejs/files/libev-cross-cc_0.2.6.patch
 delete mode 100644 recipes/nodejs/files/node-cross-cc.patch
 create mode 100644 recipes/nodejs/files/node-cross-cc_0.2.6.patch
 delete mode 100644 recipes/nodejs/nodejs_0.2.1.bb
 create mode 100644 recipes/nodejs/nodejs_0.2.6.bb

recipes/nodejs/files/libev-cross-cc.patch deleted +0 ~~-18~~

deleted file mode 100644
index 4dd34f4..0000000
@@ -1,18 +0,0 @@
-diff --git node-v0.2.1/deps/libev/wscript.orig node-v0.2.1/deps/libev/wscript
-index 19e7bb2..f0a3d3b 100644
---- node-v0.2.1/deps/libev/wscript.orig
-+++ node-v0.2.1/deps/libev/wscript
-@@ -52,7 +52,12 @@ def configure(conf):
-           return 0;
-       }
-   """
--  conf.check_cc(fragment=code, define_name="HAVE_CLOCK_SYSCALL", execute=True,
-+  # TODO determine this dynamically
-+  CROSS = True
-+  execute = True
-+  if CROSS:
-+    execute = False
-+  conf.check_cc(fragment=code, define_name="HAVE_CLOCK_SYSCALL", execute=execute,
-                 msg="Checking for SYS_clock_gettime")
- 
-   have_librt = conf.check(lib='rt', uselib_store='RT')

recipes/nodejs/files/libev-cross-cc_0.2.6.patch new file +13 -0

new file mode 100644
index 0000000..13ce4d8
@@ -0,0 +1,13 @@
+diff --git node-v0.2.6/deps/libev/wscript.orig node-v0.2.6/deps/libev/wscript
+index 19e7bb2..5ec9143 100644
+--- node-v0.2.6/deps/libev/wscript.orig
++++ node-v0.2.6/deps/libev/wscript
+@@ -52,7 +52,7 @@ def configure(conf):
+           return 0;
+       }
+   """
+-  conf.check_cc(fragment=code, define_name="HAVE_CLOCK_SYSCALL", execute=True,
++  conf.check_cc(fragment=code, define_name="HAVE_CLOCK_SYSCALL", execute=False,
+                 msg="Checking for SYS_clock_gettime")
+ 
+   have_librt = conf.check(lib='rt', uselib_store='RT')

recipes/nodejs/files/node-cross-cc.patch deleted +0 ~~-14~~

deleted file mode 100644
index 0d15afc..0000000
@@ -1,14 +0,0 @@
-diff --git node-v0.2.1/wscript.orig node-v0.2.1/wscript
-index 9c4243c..3cf6689 100644
---- node-v0.2.1/wscript.orig
-+++ node-v0.2.1/wscript
-@@ -326,6 +326,9 @@ def v8_cmd(bld, variant):
-   arch = ""
-   if bld.env['DEST_CPU'] == 'x86_64':
-     arch = "arch=x64"
-+  # XXX Better support cross-compilation
-+  else:
-+    arch = "arch=" + bld.env['DEST_CPU']
- 
-   if variant == "default":
-     mode = "release"

recipes/nodejs/files/node-cross-cc_0.2.6.patch new file +19 -0

new file mode 100644
index 0000000..1087ce2
@@ -0,0 +1,19 @@
+diff --git node-v0.2.6/wscript.orig node-v0.2.6/wscript
+index a6bade2..566bf5e 100644
+--- node-v0.2.6/wscript.orig
++++ node-v0.2.6/wscript
+@@ -338,6 +338,14 @@ def v8_cmd(bld, variant):
+   arch = ""
+   if bld.env['DEST_CPU'] == 'x86_64':
+     arch = "arch=x64"
++  elif bld.env['DEST_CPU'] == 'x86':
++    arch = "arch=x86"
++  elif bld.env['DEST_CPU'] == 'arm':
++    arch = "arch=arm"
++  elif bld.env['DEST_CPU'] == 'mips':
++    arch = "arch=mips"
++  else:
++    raise Exception(bld.env['DEST_CPU'], "is not one of these supported architectures: x86, x86_64, arm, mips")
+ 
+   if variant == "default":
+     mode = "release"

recipes/nodejs/nodejs_0.2.1.bb deleted +0 ~~-34~~

deleted file mode 100644
index c2e9c41..0000000
@@ -1,34 +0,0 @@
-DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript"
-HOMEPAGE = "http://nodejs.org"
-LICENSE = "MIT"
-
-PR = "r1"
-
-DEPENDS = "openssl"
-
-SRC_URI = " \
-  http://nodejs.org/dist/node-v${PV}.tar.gz \
-  file://libev-cross-cc.patch \
-  file://node-cross-cc.patch \
-"
-SRC_URI[md5sum] = "c6051dd216817bf0f95bea80c42cf262"
-SRC_URI[sha256sum] = "5bb7d084b2138ce43fcb34739ed894379c450a1dd569a1c710405bc39d2861c2"
-
-S = "${WORKDIR}/node-v${PV}"
-
-# v8 errors out if you have set CCACHE
-CCACHE = ""
-
-do_configure () {
-  ./configure --prefix=${prefix} --without-snapshot
-}
-
-do_compile () {
-  make
-}
-
-do_install () {
-  DESTDIR=${D} oe_runmake install
-}
-
-BBCLASSEXTEND = "native"

recipes/nodejs/nodejs_0.2.6.bb new file +32 -0

new file mode 100644
index 0000000..560adc6
@@ -0,0 +1,32 @@
+DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript"
+HOMEPAGE = "http://nodejs.org"
+LICENSE = "MIT"
+
+DEPENDS = "openssl"
+
+SRC_URI = " \
+  http://nodejs.org/dist/node-v${PV}.tar.gz \
+  file://libev-cross-cc-v${PV}.patch \
+  file://node-cross-cc-v${PV}.patch \
+"
+SRC_URI[md5sum] = "b1c50ceb43bee1b221be210b7bc7a216"
+SRC_URI[sha256sum] = "e97fe9c81ff4b569ae9a0d46e64a0572a1f171293573a5b5290bcc3996a19701"
+
+S = "${WORKDIR}/node-v${PV}"
+
+# v8 errors out if you have set CCACHE
+CCACHE = ""
+
+do_configure () {
+  ./configure --prefix=${prefix} --without-snapshot
+}
+
+do_compile () {
+  make
+}
+
+do_install () {
+  DESTDIR=${D} oe_runmake install
+}
+
+BBCLASSEXTEND = "native"

Signature · 1 line

1.7.0.4

Tom Rini

2011-02-09 19:45 UTC #1 lore raw

Quoted 3 lines · AJ ONeal

* added version number to patches
* libev-cross-cc_0.2.6.patch - turns off execution so that cross-compile succeeds
* node-cross-cc_0.2.6.patch - enables cross-compiling of v8 for x86, x86_64, arm, and mips

I didn't touch it in patchwork but (and I see these aren't all new issues):

Quoted 18 lines

recipes/nodejs/nodejs_0.2.6.bb new file +12 -0

new file mode 100644
index 0000000..560adc6
@@ -0,0 +1,32 @@
+DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript"
+HOMEPAGE = "http://nodejs.org"
+LICENSE = "MIT"
+
+DEPENDS = "openssl"
+
+SRC_URI = " \
+  http://nodejs.org/dist/node-v${PV}.tar.gz \
+  file://libev-cross-cc-v${PV}.patch \
+  file://node-cross-cc-v${PV}.patch \
+"
+SRC_URI[md5sum] = "b1c50ceb43bee1b221be210b7bc7a216"

recipes/nodejs/nodejs_0.2.6.bb line 22

Quoted 10 lines

recipes/nodejs/nodejs_0.2.6.bb new file +10 -0

+SRC_URI[sha256sum] = "e97fe9c81ff4b569ae9a0d46e64a0572a1f171293573a5b5290bcc3996a19701"
+
+S = "${WORKDIR}/node-v${PV}"
+
+# v8 errors out if you have set CCACHE
+CCACHE = ""
+
+do_configure () {
+  ./configure --prefix=${prefix} --without-snapshot
+}

Why isn't this just EXTRA_OECONF = "--without-snapshot" and using the default do_configure, compile and install?

Signature · 2 lines

Tom Rini
Mentor Graphics Corporation

Koen Kooi

2011-02-09 20:09 UTC #2 lore raw

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 34 lines · Tom Rini

Quoted 5 lines · AJ ONeal
* added version number to patches
* libev-cross-cc_0.2.6.patch - turns off execution so that cross-compile succeeds
* node-cross-cc_0.2.6.patch - enables cross-compiling of v8 for x86, x86_64, arm, and mips
I didn't touch it in patchwork but (and I see these aren't all new issues):
Quoted 25 lines
recipes/nodejs/nodejs_0.2.6.bb new file +13 -0
new file mode 100644
index 0000000..560adc6
@@ -0,0 +1,32 @@
+DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript"
+HOMEPAGE = "http://nodejs.org"
+LICENSE = "MIT"
+
+DEPENDS = "openssl"
+
+SRC_URI = " \
+  http://nodejs.org/dist/node-v${PV}.tar.gz \
+  file://libev-cross-cc-v${PV}.patch \
+  file://node-cross-cc-v${PV}.patch \
+"
+SRC_URI[md5sum] = "b1c50ceb43bee1b221be210b7bc7a216"
+SRC_URI[sha256sum] =
"e97fe9c81ff4b569ae9a0d46e64a0572a1f171293573a5b5290bcc3996a19701"
recipes/nodejs/nodejs_0.2.6.bb new file +4 -0
+
+S = "${WORKDIR}/node-v${PV}"
+
+# v8 errors out if you have set CCACHE

Quoted 8 lines

recipes/nodejs/nodejs_0.2.6.bb line 22
Quoted 5 lines
recipes/nodejs/nodejs_0.2.6.bb new file +5 -0
+CCACHE = ""
+
+do_configure () {
+  ./configure --prefix=${prefix} --without-snapshot
+}
Why isn't this just EXTRA_OECONF = "--without-snapshot" and using the default do_configure, compile and install?

It's one of those python abominations that try to look like autotools :( And as usual, it has even more bugs than autotools when you try to crosscompile
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFNUvRLMkyGM64RGpERAqflAJ9qHXDkf6jGOs1y/x+FtJ5VOEFD3gCfXaYW NV5mosMuAhYDfZVMEzXGYjE=
=pRYh
-----END PGP SIGNATURE-----

Tom Rini

2011-02-09 20:43 UTC #3 lore raw

Quoted 47 lines · Koen Kooi

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Quoted 34 lines · Tom Rini
Quoted 5 lines · AJ ONeal
* added version number to patches
* libev-cross-cc_0.2.6.patch - turns off execution so that cross-compile succeeds
* node-cross-cc_0.2.6.patch - enables cross-compiling of v8 for x86, x86_64, arm, and mips
I didn't touch it in patchwork but (and I see these aren't all new issues):
Quoted 25 lines
recipes/nodejs/nodejs_0.2.6.bb new file +13 -0
new file mode 100644
index 0000000..560adc6
@@ -0,0 +1,32 @@
+DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript"
+HOMEPAGE = "http://nodejs.org"
+LICENSE = "MIT"
+
+DEPENDS = "openssl"
+
+SRC_URI = " \
+  http://nodejs.org/dist/node-v${PV}.tar.gz \
+  file://libev-cross-cc-v${PV}.patch \
+  file://node-cross-cc-v${PV}.patch \
+"
+SRC_URI[md5sum] = "b1c50ceb43bee1b221be210b7bc7a216"
+SRC_URI[sha256sum] =
"e97fe9c81ff4b569ae9a0d46e64a0572a1f171293573a5b5290bcc3996a19701"
recipes/nodejs/nodejs_0.2.6.bb new file +4 -0
+
+S = "${WORKDIR}/node-v${PV}"
+
+# v8 errors out if you have set CCACHE
Quoted 8 lines
recipes/nodejs/nodejs_0.2.6.bb line 22
Quoted 5 lines
recipes/nodejs/nodejs_0.2.6.bb new file +5 -0
+CCACHE = ""
+
+do_configure () {
+  ./configure --prefix=${prefix} --without-snapshot
+}
Why isn't this just EXTRA_OECONF = "--without-snapshot" and using the default do_configure, compile and install?

Quoted 3 lines

It's one of those python abominations that try to look like autotools :( And as usual, it has even more bugs than autotools when you try to crosscompile

Retch. So, unless someone pops up within the next 24h and says why they did something in patchwork or otherwise objects, I'll push this. Thanks!

Signature · 2 lines

Tom Rini
Mentor Graphics Corporation

Khem Raj

2011-02-10 01:39 UTC #4 lore raw

Quoted 52 lines · Tom Rini

Quoted 51 lines · Koen Kooi
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Quoted 45 lines · Tom Rini
Quoted 6 lines · AJ ONeal
* added version number to patches
* libev-cross-cc_0.2.6.patch - turns off execution so that cross-compile succeeds
* node-cross-cc_0.2.6.patch - enables cross-compiling of v8 for x86, x86_64, arm, and mips
I didn't touch it in patchwork but (and I see these aren't all new issues):
Quoted 21 lines
recipes/nodejs/nodejs_0.2.6.bb new file +13 -0
new file mode 100644
index 0000000..560adc6
@@ -0,0 +1,32 @@
+DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript"
+HOMEPAGE = "http://nodejs.org"
+LICENSE = "MIT"
+
+DEPENDS = "openssl"
+
+SRC_URI = " \
+  http://nodejs.org/dist/node-v${PV}.tar.gz \
+  file://libev-cross-cc-v${PV}.patch \
+  file://node-cross-cc-v${PV}.patch \
+"
+SRC_URI[md5sum] = "b1c50ceb43bee1b221be210b7bc7a216"
+SRC_URI[sha256sum] =
"e97fe9c81ff4b569ae9a0d46e64a0572a1f171293573a5b5290bcc3996a19701"
recipes/nodejs/nodejs_0.2.6.bb line 22
Quoted 9 lines
recipes/nodejs/nodejs_0.2.6.bb new file +9 -0
+
+S = "${WORKDIR}/node-v${PV}"
+
+# v8 errors out if you have set CCACHE
+CCACHE = ""
+
+do_configure () {
+  ./configure --prefix=${prefix} --without-snapshot
+}
Why isn't this just EXTRA_OECONF = "--without-snapshot" and using the default do_configure, compile and install?

Quoted 7 lines

Quoted 3 lines
It's one of those python abominations that try to look like autotools :( And as usual, it has even more bugs than autotools when you try to crosscompile
Retch. So, unless someone pops up within the next 24h and says why they did something in patchwork or otherwise objects, I'll push this. Thanks!

This patch has addressed the review comments. So please go ahead. However this should be versioned for clarity if a patch is resent

Quoted 9 lines

--
Tom Rini
Mentor Graphics Corporation
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

AJ ONeal

author

2011-02-10 19:05 UTC #5 lore raw

Oops... hold on.

Forgive me, but it does not compile. I mixed up a hyphen and underscore in this commit.

I'll resubmit in a few minutes...

AJ ONeal

Quoted 80 lines · Khem Raj

Quoted 52 lines · Tom Rini
Quoted 51 lines · Koen Kooi
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Quoted 45 lines · Tom Rini
Quoted 6 lines · AJ ONeal
* added version number to patches
* libev-cross-cc_0.2.6.patch - turns off execution so that cross-compile succeeds
* node-cross-cc_0.2.6.patch - enables cross-compiling of v8 for x86, x86_64, arm, and mips
I didn't touch it in patchwork but (and I see these aren't all new issues):
Quoted 21 lines
recipes/nodejs/nodejs_0.2.6.bb new file +13 -0
new file mode 100644
index 0000000..560adc6
@@ -0,0 +1,32 @@
+DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript"
+HOMEPAGE = "http://nodejs.org"
+LICENSE = "MIT"
+
+DEPENDS = "openssl"
+
+SRC_URI = " \
+  http://nodejs.org/dist/node-v${PV}.tar.gz \
+  file://libev-cross-cc-v${PV}.patch \
+  file://node-cross-cc-v${PV}.patch \
+"
+SRC_URI[md5sum] = "b1c50ceb43bee1b221be210b7bc7a216"
+SRC_URI[sha256sum] =
"e97fe9c81ff4b569ae9a0d46e64a0572a1f171293573a5b5290bcc3996a19701"
recipes/nodejs/nodejs_0.2.6.bb line 22
Quoted 9 lines
recipes/nodejs/nodejs_0.2.6.bb new file +9 -0
+
+S = "${WORKDIR}/node-v${PV}"
+
+# v8 errors out if you have set CCACHE
+CCACHE = ""
+
+do_configure () {
+  ./configure --prefix=${prefix} --without-snapshot
+}
Why isn't this just EXTRA_OECONF = "--without-snapshot" and using the default do_configure, compile and install?
Quoted 5 lines
Quoted 3 lines
It's one of those python abominations that try to look like autotools :( And as usual, it has even more bugs than autotools when you try to crosscompile
Retch. So, unless someone pops up within the next 24h and says why they
did
Quoted 2 lines
something in patchwork or otherwise objects, I'll push this. Thanks!
This patch has addressed the review comments. So please go ahead. However this should be versioned for clarity if a patch is resent
Quoted 9 lines
--
Tom Rini
Mentor Graphics Corporation
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel