From a49c995b40fafa45575554b1b842da012e9803c2 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Mon, 14 Nov 2011 18:27:42 +0100
Subject: nodejs: update to 0.4.9

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 .../nodejs/nodejs/libev-cross-cc_0.4.2.patch       | 13 -------
 .../nodejs/nodejs/libev-cross-cc_0.4.9.patch       | 13 +++++++
 meta-oe/recipes-devtools/nodejs/nodejs_0.4.2.bb    | 45 ----------------------
 meta-oe/recipes-devtools/nodejs/nodejs_0.4.9.bb    | 37 ++++++++++++++++++
 4 files changed, 50 insertions(+), 58 deletions(-)
 delete mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/libev-cross-cc_0.4.2.patch
 create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/libev-cross-cc_0.4.9.patch
 delete mode 100644 meta-oe/recipes-devtools/nodejs/nodejs_0.4.2.bb
 create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs_0.4.9.bb

(limited to 'meta-oe/recipes-devtools')

diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/libev-cross-cc_0.4.2.patch b/meta-oe/recipes-devtools/nodejs/nodejs/libev-cross-cc_0.4.2.patch
deleted file mode 100644
index 2b9838f0c6..0000000000
--- a/meta-oe/recipes-devtools/nodejs/nodejs/libev-cross-cc_0.4.2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/deps/libev/wscript b/deps/libev/wscript
-index 4f6c9a8..1796749 100644
---- a/deps/libev/wscript
-+++ b/deps/libev/wscript
-@@ -58,7 +58,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')
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/libev-cross-cc_0.4.9.patch b/meta-oe/recipes-devtools/nodejs/nodejs/libev-cross-cc_0.4.9.patch
new file mode 100644
index 0000000000..2b9838f0c6
--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/libev-cross-cc_0.4.9.patch
@@ -0,0 +1,13 @@
+diff --git a/deps/libev/wscript b/deps/libev/wscript
+index 4f6c9a8..1796749 100644
+--- a/deps/libev/wscript
++++ b/deps/libev/wscript
+@@ -58,7 +58,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')
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_0.4.2.bb b/meta-oe/recipes-devtools/nodejs/nodejs_0.4.2.bb
deleted file mode 100644
index 0e776e0389..0000000000
--- a/meta-oe/recipes-devtools/nodejs/nodejs_0.4.2.bb
+++ /dev/null
@@ -1,45 +0,0 @@
-DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript"
-HOMEPAGE = "http://nodejs.org"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=6394136134ac02d730a7302418c94fb6"
-
-PR = "r2"
-
-DEPENDS = "openssl"
-
-def nodejs_get_gcc_version(d):
-    import subprocess,os,bb
-    if os.path.exists(bb.data.getVar('TOOLCHAIN_PATH', d, 1)+'/bin/'+bb.data.getVar('TARGET_PREFIX', d, 1)+'gcc'):
-        return subprocess.Popen([bb.data.getVar('TOOLCHAIN_PATH', d, 1)+'/bin/'+bb.data.getVar('TARGET_PREFIX', d, 1)+'gcc', '-v'], stderr=subprocess.PIPE).communicate()[1].splitlines()[-1].split()[2]
-
-SRC_URI = " \
-  http://nodejs.org/dist/node-v${PV}.tar.gz \
-  file://libev-cross-cc_${PV}.patch \
-"
-
-SRC_URI[md5sum] = "9e9e791e125f6a601ebc663dc99c72a8"
-SRC_URI[sha256sum] = "09b1100ca6828eedbe52418fbeb3352d71c0b1ff3344c44a5af3efb80c5b908c"
-
-S = "${WORKDIR}/node-v${PV}"
-
-# v8 errors out if you have set CCACHE
-CCACHE = ""
-
-do_configure () {
-  sed -i -e 's:/usr/lib:${STAGING_LIBDIR}:g' wscript
-  sed -i -e 's:/usr/local/lib:${STAGING_LIBDIR}:g' wscript
-  ./configure --prefix=${prefix} --without-snapshot
-}
-
-do_compile () {
-  make
-}
-
-do_install () {
-  DESTDIR=${D} oe_runmake install
-}
-
-RDEPENDS_${PN} = "curl python-shell python-datetime python-subprocess python-crypt python-textutils python-netclient "
-
-FILES_${PN} += "${libdir}/node/wafadmin"
-BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_0.4.9.bb b/meta-oe/recipes-devtools/nodejs/nodejs_0.4.9.bb
new file mode 100644
index 0000000000..70a526d5cb
--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_0.4.9.bb
@@ -0,0 +1,37 @@
+DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript"
+HOMEPAGE = "http://nodejs.org"
+LICENSE = "MIT && zlib"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=d6237f3a840aef5b7880fb4e49eecfe5"
+
+DEPENDS = "openssl"
+
+SRC_URI = " \
+  http://nodejs.org/dist/node-v${PV}.tar.gz \
+  file://libev-cross-cc_${PV}.patch \
+"
+SRC_URI[md5sum] = "e525b8b99d949bf2f031bc262c138e96"
+SRC_URI[sha256sum] = "f231ea6d19ea9ea4c7f8e7ff5061e7d301f1635bec7ed0ff1eef2512576ea442"
+
+S = "${WORKDIR}/node-v${PV}"
+
+# v8 errors out if you have set CCACHE
+CCACHE = ""
+
+do_configure () {
+  sed -i -e 's:/usr/lib:${STAGING_LIBDIR}:g' wscript
+  sed -i -e 's:/usr/local/lib:${STAGING_LIBDIR}:g' wscript
+  ./configure --prefix=${prefix} --without-snapshot
+}
+
+do_compile () {
+  make
+}
+
+do_install () {
+  DESTDIR=${D} oe_runmake install
+}
+
+RDEPENDS_${PN} = "curl python-shell python-datetime python-subprocess python-crypt python-textutils python-netclient "
+
+FILES_${PN} += "${libdir}/node/wafadmin"
+BBCLASSEXTEND = "native"
-- 
cgit v1.2.3-54-g00ecf