Skip to contentSkip to conversation

nodejs needs python-native

PATCH In review Amy Fong 3 participants 4 messages May 20, 2014 – May 27, 2014

lore
Share & tools
lore

Amy Fong

author
#0 lore raw

PATCH 1/1 nodejs needs python-native

From c13975829fde23138a35d63f2b641fad0fde8c72 Mon Sep 17 00:00:00 2001
From: Amy Fong <[email protected]>
Date: Tue, 20 May 2014 14:58:54 -0400
Subject: [PATCH] nodejs needs python-native

nodejs should use python from python-native package. On some hosts, the default python is missing bz2 support.

Signed-off-by Amy Fong <[email protected]>
---
 meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb +4 -1
index 996d68e..75a9ca4 100644
@@ -3,7 +3,7 @@ HOMEPAGE = "http://nodejs.org"
 LICENSE = "MIT & BSD"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=95a589a3257ab7dfe37d8a8379e3c72d"
 
-DEPENDS = "openssl"
+DEPENDS = "openssl python-native"
 
 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 \

@@ -28,6 +28,7 @@ do_configure () {
 
 do_compile () {
     export LD="${CXX}"
+    export PATH=${STAGING_BINDIR_NATIVE}/python-native:$PATH
     make BUILDTYPE=Release
 }
 

@@ -40,3 +41,5 @@ RDEPENDS_${PN}_class-native = ""
 
 FILES_${PN} += "${libdir}/node/wafadmin ${libdir}/node_modules ${libdir}/dtrace"
 BBCLASSEXTEND = "native"
+
+FILES_${PN} += "/usr/lib/*"
Signature · 1 line
2.0.0.rc0
#1 lore raw

meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb HOMEPAGE = "http://nodejs.org" · line 6

Quoted 3 lines · Amy Fong
meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb +1 -1
-DEPENDS = "openssl"
+DEPENDS = "openssl python-native"

may be it should inherit pythonnative

Quoted 11 lines
 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 \
meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb +1 -0
@@ -28,6 +28,7 @@ do_configure () {
 
 do_compile () {
     export LD="${CXX}"
+    export PATH=${STAGING_BINDIR_NATIVE}/python-native:$PATH
     make BUILDTYPE=Release
 }

meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb RDEPENDS_${PN}_class-native = "" · line 45

Quoted 5 lines
meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb +2 -0
@@ -40,3 +41,5 @@ RDEPENDS_${PN}_class-native = ""
 
 FILES_${PN} += "${libdir}/node/wafadmin ${libdir}/node_modules ${libdir}/dtrace"
 BBCLASSEXTEND = "native"
+
+FILES_${PN} += "/usr/lib/*"

make it ${libdir}/* here

#2 lore raw
Quoted 7 lines · Khem Raj

meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb HOMEPAGE = "http://nodejs.org" · line 6

Quoted 3 lines · Amy Fong
meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb +1 -1
-DEPENDS = "openssl"
+DEPENDS = "openssl python-native"

may be it should inherit pythonnative

Quoted 7 lines

meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb do_configure () { · line 31

Quoted 7 lines
  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 \
meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb +1 -0
@@ -28,6 +28,7 @@ do_configure () {
 
  do_compile () {
      export LD="${CXX}"
+    export PATH=${STAGING_BINDIR_NATIVE}/python-native:$PATH

If you inherit pythonnative, this 'export PATH...' is also not necessary

Quoted 12 lines

meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb RDEPENDS_${PN}_class-native = "" · line 45

Quoted 9 lines
meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb +2 -0
      make BUILDTYPE=Release
  }
 

@@ -40,3 +41,5 @@ RDEPENDS_${PN}_class-native = ""
 
  FILES_${PN} += "${libdir}/node/wafadmin ${libdir}/node_modules ${libdir}/dtrace"
  BBCLASSEXTEND = "native"
+
+FILES_${PN} += "/usr/lib/*"

make it ${libdir}/* here

Signature · 4 lines
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------
author
#3 lore raw

PATCH v2 1/1 nodejs needs python-native (Was: Re: [meta-oe] [PATCH] nodejs needs python-native)

In reply to Amy Fong

From 1f1029bff98bd52a52a5bf81f4f36ca86d28f8cd Mon Sep 17 00:00:00 2001
From: Amy Fong <[email protected]>
Date: Tue, 27 May 2014 12:52:00 -0400
Subject: [PATCH] nodejs needs python-native

nodejs should use python from python-native package. On some hosts, the default python is missing bz2 support.

Signed-off-by Amy Fong <[email protected]>
---
 meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb | 5 +++++
 1 file changed, 5 insertions(+)
meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb +5 -0
index 996d68e..28cf0d6 100644
@@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=95a589a3257ab7dfe37d8a8379e3c72d"
 
 DEPENDS = "openssl"
 
+inherit pythonnative
+
 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 \
 "

@@ -40,3 +42,6 @@ RDEPENDS_${PN}_class-native = ""
 
 FILES_${PN} += "${libdir}/node/wafadmin ${libdir}/node_modules ${libdir}/dtrace"
 BBCLASSEXTEND = "native"
+
+FILES_${PN} += "${libdir}/*"
+
Signature · 1 line
2.0.0.rc0