mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-05-31 13:20:03 +00:00
nodejs: Upgrade to 8.4.0
Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
@@ -0,0 +1,29 @@
|
|||||||
|
From c2aff16cc196a61f4ab1cdae4a91c7926123c239 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Zuzana Svetlikova <zsvetlik@redhat.com>
|
||||||
|
Date: Thu, 27 Apr 2017 14:25:42 +0200
|
||||||
|
Subject: [PATCH] Disable running gyp on shared deps
|
||||||
|
|
||||||
|
---
|
||||||
|
Makefile | 7 +++----
|
||||||
|
1 file changed, 3 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/Makefile b/Makefile
|
||||||
|
index 0a217bd893..e1229ad07f 100644
|
||||||
|
--- a/Makefile
|
||||||
|
+++ b/Makefile
|
||||||
|
@@ -79,10 +79,9 @@ $(NODE_G_EXE): config.gypi out/Makefile
|
||||||
|
$(MAKE) -C out BUILDTYPE=Debug V=$(V)
|
||||||
|
if [ ! -r $@ -o ! -L $@ ]; then ln -fs out/Debug/$(NODE_EXE) $@; fi
|
||||||
|
|
||||||
|
-out/Makefile: common.gypi deps/uv/uv.gyp deps/http_parser/http_parser.gyp \
|
||||||
|
- deps/zlib/zlib.gyp deps/v8/gypfiles/toolchain.gypi \
|
||||||
|
- deps/v8/gypfiles/features.gypi deps/v8/src/v8.gyp node.gyp \
|
||||||
|
- config.gypi
|
||||||
|
+out/Makefile: common.gypi deps/http_parser/http_parser.gyp \
|
||||||
|
+ deps/v8/gypfiles/toolchain.gypi deps/v8/gypfiles/features.gypi \
|
||||||
|
+ deps/v8/src/v8.gyp node.gyp config.gypi
|
||||||
|
$(PYTHON) tools/gyp_node.py -f make
|
||||||
|
|
||||||
|
config.gypi: configure
|
||||||
|
--
|
||||||
|
2.12.2
|
||||||
+29
@@ -0,0 +1,29 @@
|
|||||||
|
From c2aff16cc196a61f4ab1cdae4a91c7926123c239 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Zuzana Svetlikova <zsvetlik@redhat.com>
|
||||||
|
Date: Thu, 27 Apr 2017 14:25:42 +0200
|
||||||
|
Subject: [PATCH] Disable running gyp on shared deps
|
||||||
|
|
||||||
|
---
|
||||||
|
Makefile | 7 +++----
|
||||||
|
1 file changed, 3 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/Makefile b/Makefile
|
||||||
|
index 0a217bd893..e1229ad07f 100644
|
||||||
|
--- a/Makefile
|
||||||
|
+++ b/Makefile
|
||||||
|
@@ -79,10 +79,9 @@ $(NODE_G_EXE): config.gypi out/Makefile
|
||||||
|
$(MAKE) -C out BUILDTYPE=Debug V=$(V)
|
||||||
|
if [ ! -r $@ -o ! -L $@ ]; then ln -fs out/Debug/$(NODE_EXE) $@; fi
|
||||||
|
|
||||||
|
-out/Makefile: common.gypi deps/uv/uv.gyp deps/http_parser/http_parser.gyp \
|
||||||
|
- deps/zlib/zlib.gyp deps/v8/gypfiles/toolchain.gypi \
|
||||||
|
- deps/v8/gypfiles/features.gypi deps/v8/src/v8.gyp node.gyp \
|
||||||
|
- config.gypi
|
||||||
|
+out/Makefile: common.gypi deps/http_parser/http_parser.gyp \
|
||||||
|
+ deps/v8/gypfiles/toolchain.gypi deps/v8/gypfiles/features.gypi \
|
||||||
|
+ deps/v8/src/v8.gyp node.gyp config.gypi
|
||||||
|
$(PYTHON) tools/gyp_node.py -f make
|
||||||
|
|
||||||
|
config.gypi: configure
|
||||||
|
--
|
||||||
|
2.12.2
|
||||||
+7
-6
@@ -1,19 +1,19 @@
|
|||||||
DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript"
|
DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript"
|
||||||
HOMEPAGE = "http://nodejs.org"
|
HOMEPAGE = "http://nodejs.org"
|
||||||
LICENSE = "MIT & BSD & Artistic-2.0"
|
LICENSE = "MIT & BSD & Artistic-2.0"
|
||||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=f45e9ffb97e64da46d14f462d34a039f"
|
LIC_FILES_CHKSUM = "file://LICENSE;md5=e4d35c6120f175e1fbe5ff908b1cf2d6"
|
||||||
|
|
||||||
DEPENDS = "openssl zlib"
|
DEPENDS = "openssl10 zlib"
|
||||||
|
|
||||||
COMPATIBLE_MACHINE_armv4 = "(!.*armv4).*"
|
COMPATIBLE_MACHINE_armv4 = "(!.*armv4).*"
|
||||||
COMPATIBLE_MACHINE_armv5 = "(!.*armv5).*"
|
COMPATIBLE_MACHINE_armv5 = "(!.*armv5).*"
|
||||||
COMPATIBLE_MACHINE_mips64 = "(!.*mips64).*"
|
COMPATIBLE_MACHINE_mips64 = "(!.*mips64).*"
|
||||||
|
|
||||||
SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
|
SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
|
||||||
file://no-registry.patch \
|
file://0001-Disable-running-gyp-files-for-bundled-deps.patch \
|
||||||
"
|
"
|
||||||
SRC_URI[md5sum] = "dc40053a74100ce6df641a5b4c4d4d1e"
|
SRC_URI[md5sum] = "e6c85c83001340b30671e9432e1bd337"
|
||||||
SRC_URI[sha256sum] = "d84e7544c2e31a2d0825b4f8b093d169bf8bdb1881ee8cf75ff937918e59e9cb"
|
SRC_URI[sha256sum] = "5d5aa2a101dcc617231a475812eb8ed87cac21491f1dcc7997b9dd463563f361"
|
||||||
|
|
||||||
S = "${WORKDIR}/node-v${PV}"
|
S = "${WORKDIR}/node-v${PV}"
|
||||||
|
|
||||||
@@ -40,10 +40,11 @@ ARCHFLAGS ?= ""
|
|||||||
|
|
||||||
# Node is way too cool to use proper autotools, so we install two wrappers to forcefully inject proper arch cflags to workaround gypi
|
# 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 () {
|
do_configure () {
|
||||||
|
rm -rf ${S}/deps/openssl
|
||||||
export LD="${CXX}"
|
export LD="${CXX}"
|
||||||
GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES
|
GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES
|
||||||
# $TARGET_ARCH settings don't match --dest-cpu settings
|
# $TARGET_ARCH settings don't match --dest-cpu settings
|
||||||
./configure --prefix=${prefix} --without-snapshot --shared-openssl --shared-zlib \
|
./configure --prefix=${prefix} --without-intl --without-snapshot --shared-openssl --shared-zlib \
|
||||||
--dest-cpu="${@map_nodejs_arch(d.getVar('TARGET_ARCH'), d)}" \
|
--dest-cpu="${@map_nodejs_arch(d.getVar('TARGET_ARCH'), d)}" \
|
||||||
--dest-os=linux \
|
--dest-os=linux \
|
||||||
${ARCHFLAGS}
|
${ARCHFLAGS}
|
||||||
Reference in New Issue
Block a user