All of lore.kernel.org
 help / color / mirror / Atom feed
From: AJ ONeal <coolaj86@gmail.com>
To: openembedded-devel@lists.openembedded.org
Cc: AJ ONeal <coolaj86+fastr@gmail.com>
Subject: [PATCH] nodejs: replaced v0.2.0 with v0.2.1
Date: Wed, 15 Sep 2010 11:05:32 -0600	[thread overview]
Message-ID: <1284570332-6484-1-git-send-email-coolaj86@gmail.com> (raw)

From: AJ ONeal <coolaj86+fastr@gmail.com>

* now includes node-waf and node-repl
* updated pathname in libev-cross-cc and libev-cross-cc
* removed patch which is no longer necessary (applied upstream)

Signed-off-by: AJ ONeal <coolaj86@gmail.com>
---
 recipes/nodejs/files/libev-cross-cc.patch          |    6 ++--
 recipes/nodejs/files/node-cross-cc.patch           |    8 ++--
 .../node-dont-include-hosts-usr-include.patch      |   22 -------------
 recipes/nodejs/nodejs_0.2.0.bb                     |   32 --------------------
 recipes/nodejs/nodejs_0.2.1.bb                     |   28 +++++++++++++++++
 5 files changed, 35 insertions(+), 61 deletions(-)
 delete mode 100644 recipes/nodejs/files/node-dont-include-hosts-usr-include.patch
 delete mode 100644 recipes/nodejs/nodejs_0.2.0.bb
 create mode 100644 recipes/nodejs/nodejs_0.2.1.bb

diff --git a/recipes/nodejs/files/libev-cross-cc.patch b/recipes/nodejs/files/libev-cross-cc.patch
index 446015b..4dd34f4 100644
--- a/recipes/nodejs/files/libev-cross-cc.patch
+++ b/recipes/nodejs/files/libev-cross-cc.patch
@@ -1,7 +1,7 @@
-diff --git node-v0.2.0/deps/libev/wscript.orig node-v0.2.0/deps/libev/wscript
+diff --git node-v0.2.1/deps/libev/wscript.orig node-v0.2.1/deps/libev/wscript
 index 19e7bb2..f0a3d3b 100644
---- node-v0.2.0/deps/libev/wscript.orig
-+++ node-v0.2.0/deps/libev/wscript
+--- node-v0.2.1/deps/libev/wscript.orig
++++ node-v0.2.1/deps/libev/wscript
 @@ -52,7 +52,12 @@ def configure(conf):
            return 0;
        }
diff --git a/recipes/nodejs/files/node-cross-cc.patch b/recipes/nodejs/files/node-cross-cc.patch
index 48a6226..0d15afc 100644
--- a/recipes/nodejs/files/node-cross-cc.patch
+++ b/recipes/nodejs/files/node-cross-cc.patch
@@ -1,7 +1,7 @@
-diff --git node-v0.2.0/wscript.orig node-v0.2.0/wscript
-index df9ef53..a55d464 100644
---- node-v0.2.0/wscript.orig
-+++ node-v0.2.0/wscript
+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':
diff --git a/recipes/nodejs/files/node-dont-include-hosts-usr-include.patch b/recipes/nodejs/files/node-dont-include-hosts-usr-include.patch
deleted file mode 100644
index edbf7c4..0000000
--- a/recipes/nodejs/files/node-dont-include-hosts-usr-include.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git node-v0.2.0/wscript.orig node-v0.2.0/wscript
-index 3c5ebc5..905bd58 100644
---- node-v0.2.0/wscript.orig
-+++ node-v0.2.0/wscript
-@@ -162,11 +162,12 @@ def configure(conf):
-   if Options.options.efence:
-     conf.check(lib='efence', libpath=['/usr/lib', '/usr/local/lib'], uselib_store='EFENCE')
- 
--  if not conf.check(lib="execinfo", includes=['/usr/include', '/usr/local/include'], libpath=['/usr/lib', '/usr/local/lib'], uselib_store="EXECINFO"):
--    # Note on Darwin/OS X: This will fail, but will still be used as the
--    # execinfo stuff are part of the standard library.
--    if sys.platform.startswith("freebsd"):
--      conf.fatal("Install the libexecinfo port from /usr/ports/devel/libexecinfo.")
-+  # OpenEmbedded doesn't like us checking here
-+  #if not conf.check(lib="execinfo", includes=['/usr/include', '/usr/local/include'], libpath=['/usr/lib', '/usr/local/lib'], uselib_store="EXECINFO"):
-+  #  # Note on Darwin/OS X: This will fail, but will still be used as the
-+  #  # execinfo stuff are part of the standard library.
-+  #  if sys.platform.startswith("freebsd"):
-+  #    conf.fatal("Install the libexecinfo port from /usr/ports/devel/libexecinfo.")
- 
-   if not Options.options.without_ssl:
-     if conf.check_cfg(package='openssl',
diff --git a/recipes/nodejs/nodejs_0.2.0.bb b/recipes/nodejs/nodejs_0.2.0.bb
deleted file mode 100644
index 7dfa04e..0000000
--- a/recipes/nodejs/nodejs_0.2.0.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-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://node-cross-cc.patch \
-  file://libev-cross-cc.patch \
-  file://node-dont-include-hosts-usr-include.patch \
-"
-SRC_URI[md5sum] = "99a6dacc44b3f9c6ec376ccb446dd0b8"
-SRC_URI[sha256sum] = "3d3eff9287c9917af4044f3cef99ae5b17946710a71e83039de4fcb4b0a26631"
-
-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
-}
-
diff --git a/recipes/nodejs/nodejs_0.2.1.bb b/recipes/nodejs/nodejs_0.2.1.bb
new file mode 100644
index 0000000..5479118
--- /dev/null
+++ b/recipes/nodejs/nodejs_0.2.1.bb
@@ -0,0 +1,28 @@
+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.patch \
+  file://node-cross-cc.patch \
+"
+SRC_URI[md5sum] = "c6051dd216817bf0f95bea80c42cf262"
+SRC_URI[sha256sum] = "5bb7d084b2138ce43fcb34739ed894379c450a1dd569a1c710405bc39d2861c2"
+S = "${WORKDIR}/node-v${PV}"
+do_configure () {
+  ./configure --without-snapshot
+}
+do_compile () {
+  make
+}
+do_install () {
+  #oe_runmake install # doesn't install to correct location
+
+  # This works
+  install -d ${D}${bindir}/
+  install -m 0755 ${S}/build/default/node ${D}${bindir}/
+  install -m 0755 ${S}/bin/node-waf ${D}${bindir}/
+  install -m 0755 ${S}/bin/node-repl ${D}${bindir}/
+}
+FILES_${PN} = "${bindir}/node ${bindir}/node-repl ${bindir}/node-waf"
-- 
1.6.3.3




             reply	other threads:[~2010-09-15 17:11 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-15 17:05 AJ ONeal [this message]
2010-09-15 17:55 ` [PATCH] nodejs: replaced v0.2.0 with v0.2.1 Cliff Brake
2010-09-16  7:06   ` Koen Kooi
2010-09-16 16:29     ` AJ ONeal
2010-09-16 19:54       ` Frans Meulenbroeks
2010-09-16  7:04 ` Koen Kooi
2010-09-16  7:05 ` Koen Kooi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1284570332-6484-1-git-send-email-coolaj86@gmail.com \
    --to=coolaj86@gmail.com \
    --cc=coolaj86+fastr@gmail.com \
    --cc=openembedded-devel@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.