* [meta-oe] nodejs 8.15.0 -> 10.15.1
@ 2019-02-14 7:32 Andrej Valek
2019-02-14 14:53 ` [meta-oe][PATCH] " Andrej Valek
0 siblings, 1 reply; 14+ messages in thread
From: Andrej Valek @ 2019-02-14 7:32 UTC (permalink / raw)
To: openembedded-devel; +Cc: Matthias.Winker
Update nodejs to active 10.x LTS release 10.15.1.
Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
---
...isable-running-gyp-files-for-bundled-deps.patch | 23 ++++++--------
.../nodejs/nodejs/0002-Using-native-torque.patch | 36 ++++++++++++++++++++++
.../nodejs/{nodejs_8.15.0.bb => nodejs_10.15.1.bb} | 17 +++++++---
3 files changed, 59 insertions(+), 17 deletions(-)
create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch
rename meta-oe/recipes-devtools/nodejs/{nodejs_8.15.0.bb => nodejs_10.15.1.bb} (87%)
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
index 324a4683d..5d0dc03b6 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
@@ -4,26 +4,23 @@ 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(-)
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
-index 0a217bd893..e1229ad07f 100644
+index a98772f..f5663e2 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
+@@ -123,8 +123,8 @@ with-code-cache:
+ test-code-cache: with-code-cache
+ $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) code-cache
-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
++ deps/v8/gypfiles/toolchain.gypi \
+ deps/v8/gypfiles/features.gypi deps/v8/gypfiles/v8.gyp node.gyp \
+ config.gypi
$(PYTHON) tools/gyp_node.py -f make
-
- config.gypi: configure
--
-2.12.2
+2.19.2
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch
new file mode 100644
index 000000000..e9035f9eb
--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch
@@ -0,0 +1,36 @@
+From 4bbee5e3d58bc4911999f3ec2cc5aab8ded6717b Mon Sep 17 00:00:00 2001
+From: "Winker Matthias (TT-CA/ENG1)" <Matthias.Winker@de.bosch.com>
+Date: Tue, 11 Dec 2018 10:44:29 +0100
+Subject: [PATCH] Using native torque
+
+---
+ deps/v8/gypfiles/v8.gyp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/deps/v8/gypfiles/v8.gyp b/deps/v8/gypfiles/v8.gyp
+index 8c78f02255..434168844e 100644
+--- a/deps/v8/gypfiles/v8.gyp
++++ b/deps/v8/gypfiles/v8.gyp
+@@ -2831,7 +2831,6 @@
+ {
+ 'action_name': 'run_torque',
+ 'inputs': [ # Order matters.
+- '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)torque<(EXECUTABLE_SUFFIX)',
+ '../src/builtins/base.tq',
+ '../src/builtins/array.tq',
+ '../src/builtins/typed-array.tq',
+@@ -2845,7 +2844,10 @@
+ '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-from-dsl-gen.cc',
+ '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-from-dsl-gen.h',
+ ],
+- 'action': ['<@(_inputs)', '-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated'],
++ 'action': [
++ 'torque',
++ '<@(_inputs)',
++ '-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated'],
+ },
+ ],
+ }, # torque
+--
+2.19.2
+
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_8.15.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
similarity index 87%
rename from meta-oe/recipes-devtools/nodejs/nodejs_8.15.0.bb
rename to meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
index 44eaee974..e961af329 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_8.15.0.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
@@ -1,9 +1,10 @@
DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript"
HOMEPAGE = "http://nodejs.org"
LICENSE = "MIT & BSD & Artistic-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=fde91d5c5bbd1e0389623e1ac018d9e8"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=9ceeba79eb2ea1067b7b3ed16fff8bab"
DEPENDS = "openssl zlib icu"
+DEPENDS_append_class-target = " nodejs-native"
inherit pkgconfig
@@ -13,9 +14,13 @@ COMPATIBLE_MACHINE_mips64 = "(!.*mips64).*"
SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
file://0001-Disable-running-gyp-files-for-bundled-deps.patch \
-"
-SRC_URI[md5sum] = "bfc5da493c72ded3a7f43b5662bfc53c"
-SRC_URI[sha256sum] = "968523333947cc3f769d73dedc6c9c60580826d8714bc0e62ca4589de6a7c633"
+ "
+SRC_URI_append_class-target = " \
+ file://0002-Using-native-torque.patch \
+ "
+
+SRC_URI[md5sum] = "1cad7963255de53509bfa560221bdc88"
+SRC_URI[sha256sum] = "1a55f7b9fb80442182d9e1eba4fca4dac3c781cdcb25d6be37b24d253f61c858"
S = "${WORKDIR}/node-v${PV}"
@@ -74,6 +79,10 @@ do_install_append_class-native() {
# use sed on npm-cli.js because otherwise symlink is replaced with normal file and
# npm-cli.js continues to use old shebang
sed "1s^.*^#\!/usr/bin/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js
+
+ # Install the native torque to provide it within sysroot for the target compilation
+ install -d ${D}${bindir}
+ install -m 0755 ${S}/out/Release/torque ${D}${bindir}/torque
}
do_install_append_class-target() {
--
2.11.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [meta-oe][PATCH] nodejs 8.15.0 -> 10.15.1
2019-02-14 7:32 [meta-oe] nodejs 8.15.0 -> 10.15.1 Andrej Valek
@ 2019-02-14 14:53 ` Andrej Valek
2019-02-15 14:40 ` Khem Raj
` (4 more replies)
0 siblings, 5 replies; 14+ messages in thread
From: Andrej Valek @ 2019-02-14 14:53 UTC (permalink / raw)
To: openembedded-devel
Update nodejs to active 10.x LTS release 10.15.1.
Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
---
...isable-running-gyp-files-for-bundled-deps.patch | 23 ++++++--------
.../nodejs/nodejs/0002-Using-native-torque.patch | 36 ++++++++++++++++++++++
.../nodejs/{nodejs_8.15.0.bb => nodejs_10.15.1.bb} | 17 +++++++---
3 files changed, 59 insertions(+), 17 deletions(-)
create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch
rename meta-oe/recipes-devtools/nodejs/{nodejs_8.15.0.bb => nodejs_10.15.1.bb} (87%)
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
index 324a4683d..5d0dc03b6 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
@@ -4,26 +4,23 @@ 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(-)
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
-index 0a217bd893..e1229ad07f 100644
+index a98772f..f5663e2 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
+@@ -123,8 +123,8 @@ with-code-cache:
+ test-code-cache: with-code-cache
+ $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) code-cache
-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
++ deps/v8/gypfiles/toolchain.gypi \
+ deps/v8/gypfiles/features.gypi deps/v8/gypfiles/v8.gyp node.gyp \
+ config.gypi
$(PYTHON) tools/gyp_node.py -f make
-
- config.gypi: configure
--
-2.12.2
+2.19.2
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch
new file mode 100644
index 000000000..e9035f9eb
--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch
@@ -0,0 +1,36 @@
+From 4bbee5e3d58bc4911999f3ec2cc5aab8ded6717b Mon Sep 17 00:00:00 2001
+From: "Winker Matthias (TT-CA/ENG1)" <Matthias.Winker@de.bosch.com>
+Date: Tue, 11 Dec 2018 10:44:29 +0100
+Subject: [PATCH] Using native torque
+
+---
+ deps/v8/gypfiles/v8.gyp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/deps/v8/gypfiles/v8.gyp b/deps/v8/gypfiles/v8.gyp
+index 8c78f02255..434168844e 100644
+--- a/deps/v8/gypfiles/v8.gyp
++++ b/deps/v8/gypfiles/v8.gyp
+@@ -2831,7 +2831,6 @@
+ {
+ 'action_name': 'run_torque',
+ 'inputs': [ # Order matters.
+- '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)torque<(EXECUTABLE_SUFFIX)',
+ '../src/builtins/base.tq',
+ '../src/builtins/array.tq',
+ '../src/builtins/typed-array.tq',
+@@ -2845,7 +2844,10 @@
+ '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-from-dsl-gen.cc',
+ '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-from-dsl-gen.h',
+ ],
+- 'action': ['<@(_inputs)', '-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated'],
++ 'action': [
++ 'torque',
++ '<@(_inputs)',
++ '-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated'],
+ },
+ ],
+ }, # torque
+--
+2.19.2
+
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_8.15.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
similarity index 87%
rename from meta-oe/recipes-devtools/nodejs/nodejs_8.15.0.bb
rename to meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
index 44eaee974..e961af329 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_8.15.0.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
@@ -1,9 +1,10 @@
DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript"
HOMEPAGE = "http://nodejs.org"
LICENSE = "MIT & BSD & Artistic-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=fde91d5c5bbd1e0389623e1ac018d9e8"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=9ceeba79eb2ea1067b7b3ed16fff8bab"
DEPENDS = "openssl zlib icu"
+DEPENDS_append_class-target = " nodejs-native"
inherit pkgconfig
@@ -13,9 +14,13 @@ COMPATIBLE_MACHINE_mips64 = "(!.*mips64).*"
SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
file://0001-Disable-running-gyp-files-for-bundled-deps.patch \
-"
-SRC_URI[md5sum] = "bfc5da493c72ded3a7f43b5662bfc53c"
-SRC_URI[sha256sum] = "968523333947cc3f769d73dedc6c9c60580826d8714bc0e62ca4589de6a7c633"
+ "
+SRC_URI_append_class-target = " \
+ file://0002-Using-native-torque.patch \
+ "
+
+SRC_URI[md5sum] = "1cad7963255de53509bfa560221bdc88"
+SRC_URI[sha256sum] = "1a55f7b9fb80442182d9e1eba4fca4dac3c781cdcb25d6be37b24d253f61c858"
S = "${WORKDIR}/node-v${PV}"
@@ -74,6 +79,10 @@ do_install_append_class-native() {
# use sed on npm-cli.js because otherwise symlink is replaced with normal file and
# npm-cli.js continues to use old shebang
sed "1s^.*^#\!/usr/bin/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js
+
+ # Install the native torque to provide it within sysroot for the target compilation
+ install -d ${D}${bindir}
+ install -m 0755 ${S}/out/Release/torque ${D}${bindir}/torque
}
do_install_append_class-target() {
--
2.11.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [meta-oe][PATCH] nodejs 8.15.0 -> 10.15.1
2019-02-14 14:53 ` [meta-oe][PATCH] " Andrej Valek
@ 2019-02-15 14:40 ` Khem Raj
2019-02-15 20:42 ` [meta-oe][PATCH v2] " Andrej Valek
` (3 subsequent siblings)
4 siblings, 0 replies; 14+ messages in thread
From: Khem Raj @ 2019-02-15 14:40 UTC (permalink / raw)
To: Andrej Valek; +Cc: openembeded-devel
fail on mips missing atomics probabbly need to link
libatomics
https://errors.yoctoproject.org/Errors/Details/228061/
On Thu, Feb 14, 2019 at 6:53 AM Andrej Valek <andrej.valek@siemens.com> wrote:
>
> Update nodejs to active 10.x LTS release 10.15.1.
>
> Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
> ---
> ...isable-running-gyp-files-for-bundled-deps.patch | 23 ++++++--------
> .../nodejs/nodejs/0002-Using-native-torque.patch | 36 ++++++++++++++++++++++
> .../nodejs/{nodejs_8.15.0.bb => nodejs_10.15.1.bb} | 17 +++++++---
> 3 files changed, 59 insertions(+), 17 deletions(-)
> create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch
> rename meta-oe/recipes-devtools/nodejs/{nodejs_8.15.0.bb => nodejs_10.15.1.bb} (87%)
>
> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
> index 324a4683d..5d0dc03b6 100644
> --- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
> +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
> @@ -4,26 +4,23 @@ 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(-)
> + Makefile | 4 ++--
> + 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Makefile b/Makefile
> -index 0a217bd893..e1229ad07f 100644
> +index a98772f..f5663e2 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
> +@@ -123,8 +123,8 @@ with-code-cache:
> + test-code-cache: with-code-cache
> + $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) code-cache
>
> -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
> ++ deps/v8/gypfiles/toolchain.gypi \
> + deps/v8/gypfiles/features.gypi deps/v8/gypfiles/v8.gyp node.gyp \
> + config.gypi
> $(PYTHON) tools/gyp_node.py -f make
> -
> - config.gypi: configure
> --
> -2.12.2
> +2.19.2
> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch
> new file mode 100644
> index 000000000..e9035f9eb
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch
> @@ -0,0 +1,36 @@
> +From 4bbee5e3d58bc4911999f3ec2cc5aab8ded6717b Mon Sep 17 00:00:00 2001
> +From: "Winker Matthias (TT-CA/ENG1)" <Matthias.Winker@de.bosch.com>
> +Date: Tue, 11 Dec 2018 10:44:29 +0100
> +Subject: [PATCH] Using native torque
> +
> +---
> + deps/v8/gypfiles/v8.gyp | 6 ++++--
> + 1 file changed, 4 insertions(+), 2 deletions(-)
> +
> +diff --git a/deps/v8/gypfiles/v8.gyp b/deps/v8/gypfiles/v8.gyp
> +index 8c78f02255..434168844e 100644
> +--- a/deps/v8/gypfiles/v8.gyp
> ++++ b/deps/v8/gypfiles/v8.gyp
> +@@ -2831,7 +2831,6 @@
> + {
> + 'action_name': 'run_torque',
> + 'inputs': [ # Order matters.
> +- '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)torque<(EXECUTABLE_SUFFIX)',
> + '../src/builtins/base.tq',
> + '../src/builtins/array.tq',
> + '../src/builtins/typed-array.tq',
> +@@ -2845,7 +2844,10 @@
> + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-from-dsl-gen.cc',
> + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-from-dsl-gen.h',
> + ],
> +- 'action': ['<@(_inputs)', '-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated'],
> ++ 'action': [
> ++ 'torque',
> ++ '<@(_inputs)',
> ++ '-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated'],
> + },
> + ],
> + }, # torque
> +--
> +2.19.2
> +
> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_8.15.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
> similarity index 87%
> rename from meta-oe/recipes-devtools/nodejs/nodejs_8.15.0.bb
> rename to meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
> index 44eaee974..e961af329 100644
> --- a/meta-oe/recipes-devtools/nodejs/nodejs_8.15.0.bb
> +++ b/meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
> @@ -1,9 +1,10 @@
> DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript"
> HOMEPAGE = "http://nodejs.org"
> LICENSE = "MIT & BSD & Artistic-2.0"
> -LIC_FILES_CHKSUM = "file://LICENSE;md5=fde91d5c5bbd1e0389623e1ac018d9e8"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=9ceeba79eb2ea1067b7b3ed16fff8bab"
>
> DEPENDS = "openssl zlib icu"
> +DEPENDS_append_class-target = " nodejs-native"
>
> inherit pkgconfig
>
> @@ -13,9 +14,13 @@ COMPATIBLE_MACHINE_mips64 = "(!.*mips64).*"
>
> SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
> file://0001-Disable-running-gyp-files-for-bundled-deps.patch \
> -"
> -SRC_URI[md5sum] = "bfc5da493c72ded3a7f43b5662bfc53c"
> -SRC_URI[sha256sum] = "968523333947cc3f769d73dedc6c9c60580826d8714bc0e62ca4589de6a7c633"
> + "
> +SRC_URI_append_class-target = " \
> + file://0002-Using-native-torque.patch \
> + "
> +
> +SRC_URI[md5sum] = "1cad7963255de53509bfa560221bdc88"
> +SRC_URI[sha256sum] = "1a55f7b9fb80442182d9e1eba4fca4dac3c781cdcb25d6be37b24d253f61c858"
>
> S = "${WORKDIR}/node-v${PV}"
>
> @@ -74,6 +79,10 @@ do_install_append_class-native() {
> # use sed on npm-cli.js because otherwise symlink is replaced with normal file and
> # npm-cli.js continues to use old shebang
> sed "1s^.*^#\!/usr/bin/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js
> +
> + # Install the native torque to provide it within sysroot for the target compilation
> + install -d ${D}${bindir}
> + install -m 0755 ${S}/out/Release/torque ${D}${bindir}/torque
> }
>
> do_install_append_class-target() {
> --
> 2.11.0
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 14+ messages in thread
* [meta-oe][PATCH v2] nodejs 8.15.0 -> 10.15.1
2019-02-14 14:53 ` [meta-oe][PATCH] " Andrej Valek
2019-02-15 14:40 ` Khem Raj
@ 2019-02-15 20:42 ` Andrej Valek
2019-02-16 6:35 ` Khem Raj
2019-02-17 9:12 ` [meta-oe][PATCH v3] " Andrej Valek
` (2 subsequent siblings)
4 siblings, 1 reply; 14+ messages in thread
From: Andrej Valek @ 2019-02-15 20:42 UTC (permalink / raw)
To: openembedded-devel
Update nodejs to active 10.x LTS release 10.15.1.
Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
---
...isable-running-gyp-files-for-bundled-deps.patch | 23 ++++++--------
.../nodejs/nodejs/0002-Using-native-torque.patch | 36 ++++++++++++++++++++++
.../nodejs/nodejs/0003-Link-atomic-library.patch | 20 ++++++++++++
.../nodejs/{nodejs_8.15.0.bb => nodejs_10.15.1.bb} | 18 ++++++++---
4 files changed, 80 insertions(+), 17 deletions(-)
create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch
create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0003-Link-atomic-library.patch
rename meta-oe/recipes-devtools/nodejs/{nodejs_8.15.0.bb => nodejs_10.15.1.bb} (86%)
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
index 324a4683d..5d0dc03b6 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
@@ -4,26 +4,23 @@ 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(-)
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
-index 0a217bd893..e1229ad07f 100644
+index a98772f..f5663e2 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
+@@ -123,8 +123,8 @@ with-code-cache:
+ test-code-cache: with-code-cache
+ $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) code-cache
-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
++ deps/v8/gypfiles/toolchain.gypi \
+ deps/v8/gypfiles/features.gypi deps/v8/gypfiles/v8.gyp node.gyp \
+ config.gypi
$(PYTHON) tools/gyp_node.py -f make
-
- config.gypi: configure
--
-2.12.2
+2.19.2
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch
new file mode 100644
index 000000000..e9035f9eb
--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch
@@ -0,0 +1,36 @@
+From 4bbee5e3d58bc4911999f3ec2cc5aab8ded6717b Mon Sep 17 00:00:00 2001
+From: "Winker Matthias (TT-CA/ENG1)" <Matthias.Winker@de.bosch.com>
+Date: Tue, 11 Dec 2018 10:44:29 +0100
+Subject: [PATCH] Using native torque
+
+---
+ deps/v8/gypfiles/v8.gyp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/deps/v8/gypfiles/v8.gyp b/deps/v8/gypfiles/v8.gyp
+index 8c78f02255..434168844e 100644
+--- a/deps/v8/gypfiles/v8.gyp
++++ b/deps/v8/gypfiles/v8.gyp
+@@ -2831,7 +2831,6 @@
+ {
+ 'action_name': 'run_torque',
+ 'inputs': [ # Order matters.
+- '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)torque<(EXECUTABLE_SUFFIX)',
+ '../src/builtins/base.tq',
+ '../src/builtins/array.tq',
+ '../src/builtins/typed-array.tq',
+@@ -2845,7 +2844,10 @@
+ '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-from-dsl-gen.cc',
+ '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-from-dsl-gen.h',
+ ],
+- 'action': ['<@(_inputs)', '-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated'],
++ 'action': [
++ 'torque',
++ '<@(_inputs)',
++ '-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated'],
+ },
+ ],
+ }, # torque
+--
+2.19.2
+
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0003-Link-atomic-library.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0003-Link-atomic-library.patch
new file mode 100644
index 000000000..66ff18b4a
--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0003-Link-atomic-library.patch
@@ -0,0 +1,20 @@
+Link atomic library to fix missing undefined referrences
+like "undefined reference to `__atomic_fetch_add_8'"
+
+Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
+
+diff -Naur node-v10.15.1/deps/v8/gypfiles/v8.gyp node-v10.15.1/deps/v8/gypfiles/v8.gyp
+--- node-v10.15.1/deps/v8/gypfiles/v8.gyp 2019-02-13 09:02:21.000000000 +0100
++++ node-v10.15.1/deps/v8/gypfiles/v8.gyp 2019-02-15 21:27:11.755679660 +0100
+@@ -452,6 +452,11 @@
+ '<(DEPTH)',
+ '<(SHARED_INTERMEDIATE_DIR)'
+ ],
++ 'link_settings': {
++ 'libraries': [
++ '-latomic'
++ ],
++ },
+ 'sources': [
+ '<@(inspector_all_sources)',
+ '../include//v8-inspector-protocol.h',
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_8.15.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
similarity index 86%
rename from meta-oe/recipes-devtools/nodejs/nodejs_8.15.0.bb
rename to meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
index 44eaee974..f2bfe8abe 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_8.15.0.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
@@ -1,9 +1,10 @@
DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript"
HOMEPAGE = "http://nodejs.org"
LICENSE = "MIT & BSD & Artistic-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=fde91d5c5bbd1e0389623e1ac018d9e8"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=9ceeba79eb2ea1067b7b3ed16fff8bab"
DEPENDS = "openssl zlib icu"
+DEPENDS_append_class-target = " nodejs-native"
inherit pkgconfig
@@ -13,9 +14,14 @@ COMPATIBLE_MACHINE_mips64 = "(!.*mips64).*"
SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
file://0001-Disable-running-gyp-files-for-bundled-deps.patch \
-"
-SRC_URI[md5sum] = "bfc5da493c72ded3a7f43b5662bfc53c"
-SRC_URI[sha256sum] = "968523333947cc3f769d73dedc6c9c60580826d8714bc0e62ca4589de6a7c633"
+ file://0003-Link-atomic-library.patch \
+ "
+SRC_URI_append_class-target = " \
+ file://0002-Using-native-torque.patch \
+ "
+
+SRC_URI[md5sum] = "1cad7963255de53509bfa560221bdc88"
+SRC_URI[sha256sum] = "1a55f7b9fb80442182d9e1eba4fca4dac3c781cdcb25d6be37b24d253f61c858"
S = "${WORKDIR}/node-v${PV}"
@@ -74,6 +80,10 @@ do_install_append_class-native() {
# use sed on npm-cli.js because otherwise symlink is replaced with normal file and
# npm-cli.js continues to use old shebang
sed "1s^.*^#\!/usr/bin/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js
+
+ # Install the native torque to provide it within sysroot for the target compilation
+ install -d ${D}${bindir}
+ install -m 0755 ${S}/out/Release/torque ${D}${bindir}/torque
}
do_install_append_class-target() {
--
2.11.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [meta-oe][PATCH v2] nodejs 8.15.0 -> 10.15.1
2019-02-15 20:42 ` [meta-oe][PATCH v2] " Andrej Valek
@ 2019-02-16 6:35 ` Khem Raj
2019-02-16 6:35 ` Khem Raj
0 siblings, 1 reply; 14+ messages in thread
From: Khem Raj @ 2019-02-16 6:35 UTC (permalink / raw)
To: Andrej Valek; +Cc: openembeded-devel
On Fri, Feb 15, 2019 at 12:43 PM Andrej Valek <andrej.valek@siemens.com> wrote:
>
> Update nodejs to active 10.x LTS release 10.15.1.
>
nodejs-native fails on ubuntu 14.04 which has gcc 4.8, I wonder
if there is a fix for this or do we expect it to not work
with 4.8 compiler
> Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
> ---
> ...isable-running-gyp-files-for-bundled-deps.patch | 23 ++++++--------
> .../nodejs/nodejs/0002-Using-native-torque.patch | 36 ++++++++++++++++++++++
> .../nodejs/nodejs/0003-Link-atomic-library.patch | 20 ++++++++++++
> .../nodejs/{nodejs_8.15.0.bb => nodejs_10.15.1.bb} | 18 ++++++++---
> 4 files changed, 80 insertions(+), 17 deletions(-)
> create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch
> create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0003-Link-atomic-library.patch
> rename meta-oe/recipes-devtools/nodejs/{nodejs_8.15.0.bb => nodejs_10.15.1.bb} (86%)
>
> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
> index 324a4683d..5d0dc03b6 100644
> --- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
> +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
> @@ -4,26 +4,23 @@ 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(-)
> + Makefile | 4 ++--
> + 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Makefile b/Makefile
> -index 0a217bd893..e1229ad07f 100644
> +index a98772f..f5663e2 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
> +@@ -123,8 +123,8 @@ with-code-cache:
> + test-code-cache: with-code-cache
> + $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) code-cache
>
> -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
> ++ deps/v8/gypfiles/toolchain.gypi \
> + deps/v8/gypfiles/features.gypi deps/v8/gypfiles/v8.gyp node.gyp \
> + config.gypi
> $(PYTHON) tools/gyp_node.py -f make
> -
> - config.gypi: configure
> --
> -2.12.2
> +2.19.2
> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch
> new file mode 100644
> index 000000000..e9035f9eb
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch
> @@ -0,0 +1,36 @@
> +From 4bbee5e3d58bc4911999f3ec2cc5aab8ded6717b Mon Sep 17 00:00:00 2001
> +From: "Winker Matthias (TT-CA/ENG1)" <Matthias.Winker@de.bosch.com>
> +Date: Tue, 11 Dec 2018 10:44:29 +0100
> +Subject: [PATCH] Using native torque
> +
> +---
> + deps/v8/gypfiles/v8.gyp | 6 ++++--
> + 1 file changed, 4 insertions(+), 2 deletions(-)
> +
> +diff --git a/deps/v8/gypfiles/v8.gyp b/deps/v8/gypfiles/v8.gyp
> +index 8c78f02255..434168844e 100644
> +--- a/deps/v8/gypfiles/v8.gyp
> ++++ b/deps/v8/gypfiles/v8.gyp
> +@@ -2831,7 +2831,6 @@
> + {
> + 'action_name': 'run_torque',
> + 'inputs': [ # Order matters.
> +- '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)torque<(EXECUTABLE_SUFFIX)',
> + '../src/builtins/base.tq',
> + '../src/builtins/array.tq',
> + '../src/builtins/typed-array.tq',
> +@@ -2845,7 +2844,10 @@
> + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-from-dsl-gen.cc',
> + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-from-dsl-gen.h',
> + ],
> +- 'action': ['<@(_inputs)', '-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated'],
> ++ 'action': [
> ++ 'torque',
> ++ '<@(_inputs)',
> ++ '-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated'],
> + },
> + ],
> + }, # torque
> +--
> +2.19.2
> +
> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0003-Link-atomic-library.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0003-Link-atomic-library.patch
> new file mode 100644
> index 000000000..66ff18b4a
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0003-Link-atomic-library.patch
> @@ -0,0 +1,20 @@
> +Link atomic library to fix missing undefined referrences
> +like "undefined reference to `__atomic_fetch_add_8'"
> +
> +Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
> +
> +diff -Naur node-v10.15.1/deps/v8/gypfiles/v8.gyp node-v10.15.1/deps/v8/gypfiles/v8.gyp
> +--- node-v10.15.1/deps/v8/gypfiles/v8.gyp 2019-02-13 09:02:21.000000000 +0100
> ++++ node-v10.15.1/deps/v8/gypfiles/v8.gyp 2019-02-15 21:27:11.755679660 +0100
> +@@ -452,6 +452,11 @@
> + '<(DEPTH)',
> + '<(SHARED_INTERMEDIATE_DIR)'
> + ],
> ++ 'link_settings': {
> ++ 'libraries': [
> ++ '-latomic'
> ++ ],
> ++ },
> + 'sources': [
> + '<@(inspector_all_sources)',
> + '../include//v8-inspector-protocol.h',
> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_8.15.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
> similarity index 86%
> rename from meta-oe/recipes-devtools/nodejs/nodejs_8.15.0.bb
> rename to meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
> index 44eaee974..f2bfe8abe 100644
> --- a/meta-oe/recipes-devtools/nodejs/nodejs_8.15.0.bb
> +++ b/meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
> @@ -1,9 +1,10 @@
> DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript"
> HOMEPAGE = "http://nodejs.org"
> LICENSE = "MIT & BSD & Artistic-2.0"
> -LIC_FILES_CHKSUM = "file://LICENSE;md5=fde91d5c5bbd1e0389623e1ac018d9e8"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=9ceeba79eb2ea1067b7b3ed16fff8bab"
>
> DEPENDS = "openssl zlib icu"
> +DEPENDS_append_class-target = " nodejs-native"
>
> inherit pkgconfig
>
> @@ -13,9 +14,14 @@ COMPATIBLE_MACHINE_mips64 = "(!.*mips64).*"
>
> SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
> file://0001-Disable-running-gyp-files-for-bundled-deps.patch \
> -"
> -SRC_URI[md5sum] = "bfc5da493c72ded3a7f43b5662bfc53c"
> -SRC_URI[sha256sum] = "968523333947cc3f769d73dedc6c9c60580826d8714bc0e62ca4589de6a7c633"
> + file://0003-Link-atomic-library.patch \
> + "
> +SRC_URI_append_class-target = " \
> + file://0002-Using-native-torque.patch \
> + "
> +
> +SRC_URI[md5sum] = "1cad7963255de53509bfa560221bdc88"
> +SRC_URI[sha256sum] = "1a55f7b9fb80442182d9e1eba4fca4dac3c781cdcb25d6be37b24d253f61c858"
>
> S = "${WORKDIR}/node-v${PV}"
>
> @@ -74,6 +80,10 @@ do_install_append_class-native() {
> # use sed on npm-cli.js because otherwise symlink is replaced with normal file and
> # npm-cli.js continues to use old shebang
> sed "1s^.*^#\!/usr/bin/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js
> +
> + # Install the native torque to provide it within sysroot for the target compilation
> + install -d ${D}${bindir}
> + install -m 0755 ${S}/out/Release/torque ${D}${bindir}/torque
> }
>
> do_install_append_class-target() {
> --
> 2.11.0
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [meta-oe][PATCH v2] nodejs 8.15.0 -> 10.15.1
2019-02-16 6:35 ` Khem Raj
@ 2019-02-16 6:35 ` Khem Raj
2019-02-16 7:54 ` Andrej Valek
0 siblings, 1 reply; 14+ messages in thread
From: Khem Raj @ 2019-02-16 6:35 UTC (permalink / raw)
To: Andrej Valek; +Cc: openembeded-devel
here is link https://errors.yoctoproject.org/Errors/Details/228122/
On Fri, Feb 15, 2019 at 10:35 PM Khem Raj <raj.khem@gmail.com> wrote:
>
> On Fri, Feb 15, 2019 at 12:43 PM Andrej Valek <andrej.valek@siemens.com> wrote:
> >
> > Update nodejs to active 10.x LTS release 10.15.1.
> >
>
> nodejs-native fails on ubuntu 14.04 which has gcc 4.8, I wonder
> if there is a fix for this or do we expect it to not work
> with 4.8 compiler
>
> > Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
> > ---
> > ...isable-running-gyp-files-for-bundled-deps.patch | 23 ++++++--------
> > .../nodejs/nodejs/0002-Using-native-torque.patch | 36 ++++++++++++++++++++++
> > .../nodejs/nodejs/0003-Link-atomic-library.patch | 20 ++++++++++++
> > .../nodejs/{nodejs_8.15.0.bb => nodejs_10.15.1.bb} | 18 ++++++++---
> > 4 files changed, 80 insertions(+), 17 deletions(-)
> > create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch
> > create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0003-Link-atomic-library.patch
> > rename meta-oe/recipes-devtools/nodejs/{nodejs_8.15.0.bb => nodejs_10.15.1.bb} (86%)
> >
> > diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
> > index 324a4683d..5d0dc03b6 100644
> > --- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
> > +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
> > @@ -4,26 +4,23 @@ 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(-)
> > + Makefile | 4 ++--
> > + 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/Makefile b/Makefile
> > -index 0a217bd893..e1229ad07f 100644
> > +index a98772f..f5663e2 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
> > +@@ -123,8 +123,8 @@ with-code-cache:
> > + test-code-cache: with-code-cache
> > + $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) code-cache
> >
> > -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
> > ++ deps/v8/gypfiles/toolchain.gypi \
> > + deps/v8/gypfiles/features.gypi deps/v8/gypfiles/v8.gyp node.gyp \
> > + config.gypi
> > $(PYTHON) tools/gyp_node.py -f make
> > -
> > - config.gypi: configure
> > --
> > -2.12.2
> > +2.19.2
> > diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch
> > new file mode 100644
> > index 000000000..e9035f9eb
> > --- /dev/null
> > +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch
> > @@ -0,0 +1,36 @@
> > +From 4bbee5e3d58bc4911999f3ec2cc5aab8ded6717b Mon Sep 17 00:00:00 2001
> > +From: "Winker Matthias (TT-CA/ENG1)" <Matthias.Winker@de.bosch.com>
> > +Date: Tue, 11 Dec 2018 10:44:29 +0100
> > +Subject: [PATCH] Using native torque
> > +
> > +---
> > + deps/v8/gypfiles/v8.gyp | 6 ++++--
> > + 1 file changed, 4 insertions(+), 2 deletions(-)
> > +
> > +diff --git a/deps/v8/gypfiles/v8.gyp b/deps/v8/gypfiles/v8.gyp
> > +index 8c78f02255..434168844e 100644
> > +--- a/deps/v8/gypfiles/v8.gyp
> > ++++ b/deps/v8/gypfiles/v8.gyp
> > +@@ -2831,7 +2831,6 @@
> > + {
> > + 'action_name': 'run_torque',
> > + 'inputs': [ # Order matters.
> > +- '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)torque<(EXECUTABLE_SUFFIX)',
> > + '../src/builtins/base.tq',
> > + '../src/builtins/array.tq',
> > + '../src/builtins/typed-array.tq',
> > +@@ -2845,7 +2844,10 @@
> > + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-from-dsl-gen.cc',
> > + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-from-dsl-gen.h',
> > + ],
> > +- 'action': ['<@(_inputs)', '-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated'],
> > ++ 'action': [
> > ++ 'torque',
> > ++ '<@(_inputs)',
> > ++ '-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated'],
> > + },
> > + ],
> > + }, # torque
> > +--
> > +2.19.2
> > +
> > diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0003-Link-atomic-library.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0003-Link-atomic-library.patch
> > new file mode 100644
> > index 000000000..66ff18b4a
> > --- /dev/null
> > +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0003-Link-atomic-library.patch
> > @@ -0,0 +1,20 @@
> > +Link atomic library to fix missing undefined referrences
> > +like "undefined reference to `__atomic_fetch_add_8'"
> > +
> > +Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
> > +
> > +diff -Naur node-v10.15.1/deps/v8/gypfiles/v8.gyp node-v10.15.1/deps/v8/gypfiles/v8.gyp
> > +--- node-v10.15.1/deps/v8/gypfiles/v8.gyp 2019-02-13 09:02:21.000000000 +0100
> > ++++ node-v10.15.1/deps/v8/gypfiles/v8.gyp 2019-02-15 21:27:11.755679660 +0100
> > +@@ -452,6 +452,11 @@
> > + '<(DEPTH)',
> > + '<(SHARED_INTERMEDIATE_DIR)'
> > + ],
> > ++ 'link_settings': {
> > ++ 'libraries': [
> > ++ '-latomic'
> > ++ ],
> > ++ },
> > + 'sources': [
> > + '<@(inspector_all_sources)',
> > + '../include//v8-inspector-protocol.h',
> > diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_8.15.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
> > similarity index 86%
> > rename from meta-oe/recipes-devtools/nodejs/nodejs_8.15.0.bb
> > rename to meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
> > index 44eaee974..f2bfe8abe 100644
> > --- a/meta-oe/recipes-devtools/nodejs/nodejs_8.15.0.bb
> > +++ b/meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
> > @@ -1,9 +1,10 @@
> > DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript"
> > HOMEPAGE = "http://nodejs.org"
> > LICENSE = "MIT & BSD & Artistic-2.0"
> > -LIC_FILES_CHKSUM = "file://LICENSE;md5=fde91d5c5bbd1e0389623e1ac018d9e8"
> > +LIC_FILES_CHKSUM = "file://LICENSE;md5=9ceeba79eb2ea1067b7b3ed16fff8bab"
> >
> > DEPENDS = "openssl zlib icu"
> > +DEPENDS_append_class-target = " nodejs-native"
> >
> > inherit pkgconfig
> >
> > @@ -13,9 +14,14 @@ COMPATIBLE_MACHINE_mips64 = "(!.*mips64).*"
> >
> > SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
> > file://0001-Disable-running-gyp-files-for-bundled-deps.patch \
> > -"
> > -SRC_URI[md5sum] = "bfc5da493c72ded3a7f43b5662bfc53c"
> > -SRC_URI[sha256sum] = "968523333947cc3f769d73dedc6c9c60580826d8714bc0e62ca4589de6a7c633"
> > + file://0003-Link-atomic-library.patch \
> > + "
> > +SRC_URI_append_class-target = " \
> > + file://0002-Using-native-torque.patch \
> > + "
> > +
> > +SRC_URI[md5sum] = "1cad7963255de53509bfa560221bdc88"
> > +SRC_URI[sha256sum] = "1a55f7b9fb80442182d9e1eba4fca4dac3c781cdcb25d6be37b24d253f61c858"
> >
> > S = "${WORKDIR}/node-v${PV}"
> >
> > @@ -74,6 +80,10 @@ do_install_append_class-native() {
> > # use sed on npm-cli.js because otherwise symlink is replaced with normal file and
> > # npm-cli.js continues to use old shebang
> > sed "1s^.*^#\!/usr/bin/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js
> > +
> > + # Install the native torque to provide it within sysroot for the target compilation
> > + install -d ${D}${bindir}
> > + install -m 0755 ${S}/out/Release/torque ${D}${bindir}/torque
> > }
> >
> > do_install_append_class-target() {
> > --
> > 2.11.0
> >
> > --
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [meta-oe][PATCH v2] nodejs 8.15.0 -> 10.15.1
2019-02-16 6:35 ` Khem Raj
@ 2019-02-16 7:54 ` Andrej Valek
2019-02-16 8:34 ` Andrej Valek
0 siblings, 1 reply; 14+ messages in thread
From: Andrej Valek @ 2019-02-16 7:54 UTC (permalink / raw)
To: Khem Raj; +Cc: openembeded-devel
Hi,
I have set-up qemumips build, to check, if it's working or not.
But, is it really strange, isn't it?
What about just add it directly into ldflags, like "-Wl,--as-needed" ?
Andrej
On 2/16/19 7:35 AM, Khem Raj wrote:
> here is link https://errors.yoctoproject.org/Errors/Details/228122/
> On Fri, Feb 15, 2019 at 10:35 PM Khem Raj <raj.khem@gmail.com> wrote:
>>
>> On Fri, Feb 15, 2019 at 12:43 PM Andrej Valek <andrej.valek@siemens.com> wrote:
>>>
>>> Update nodejs to active 10.x LTS release 10.15.1.
>>>
>>
>> nodejs-native fails on ubuntu 14.04 which has gcc 4.8, I wonder
>> if there is a fix for this or do we expect it to not work
>> with 4.8 compiler
>>
>>> Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
>>> ---
>>> ...isable-running-gyp-files-for-bundled-deps.patch | 23 ++++++--------
>>> .../nodejs/nodejs/0002-Using-native-torque.patch | 36 ++++++++++++++++++++++
>>> .../nodejs/nodejs/0003-Link-atomic-library.patch | 20 ++++++++++++
>>> .../nodejs/{nodejs_8.15.0.bb => nodejs_10.15.1.bb} | 18 ++++++++---
>>> 4 files changed, 80 insertions(+), 17 deletions(-)
>>> create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch
>>> create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0003-Link-atomic-library.patch
>>> rename meta-oe/recipes-devtools/nodejs/{nodejs_8.15.0.bb => nodejs_10.15.1.bb} (86%)
>>>
>>> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
>>> index 324a4683d..5d0dc03b6 100644
>>> --- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
>>> +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
>>> @@ -4,26 +4,23 @@ 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(-)
>>> + Makefile | 4 ++--
>>> + 1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/Makefile b/Makefile
>>> -index 0a217bd893..e1229ad07f 100644
>>> +index a98772f..f5663e2 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
>>> +@@ -123,8 +123,8 @@ with-code-cache:
>>> + test-code-cache: with-code-cache
>>> + $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) code-cache
>>>
>>> -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
>>> ++ deps/v8/gypfiles/toolchain.gypi \
>>> + deps/v8/gypfiles/features.gypi deps/v8/gypfiles/v8.gyp node.gyp \
>>> + config.gypi
>>> $(PYTHON) tools/gyp_node.py -f make
>>> -
>>> - config.gypi: configure
>>> --
>>> -2.12.2
>>> +2.19.2
>>> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch
>>> new file mode 100644
>>> index 000000000..e9035f9eb
>>> --- /dev/null
>>> +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch
>>> @@ -0,0 +1,36 @@
>>> +From 4bbee5e3d58bc4911999f3ec2cc5aab8ded6717b Mon Sep 17 00:00:00 2001
>>> +From: "Winker Matthias (TT-CA/ENG1)" <Matthias.Winker@de.bosch.com>
>>> +Date: Tue, 11 Dec 2018 10:44:29 +0100
>>> +Subject: [PATCH] Using native torque
>>> +
>>> +---
>>> + deps/v8/gypfiles/v8.gyp | 6 ++++--
>>> + 1 file changed, 4 insertions(+), 2 deletions(-)
>>> +
>>> +diff --git a/deps/v8/gypfiles/v8.gyp b/deps/v8/gypfiles/v8.gyp
>>> +index 8c78f02255..434168844e 100644
>>> +--- a/deps/v8/gypfiles/v8.gyp
>>> ++++ b/deps/v8/gypfiles/v8.gyp
>>> +@@ -2831,7 +2831,6 @@
>>> + {
>>> + 'action_name': 'run_torque',
>>> + 'inputs': [ # Order matters.
>>> +- '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)torque<(EXECUTABLE_SUFFIX)',
>>> + '../src/builtins/base.tq',
>>> + '../src/builtins/array.tq',
>>> + '../src/builtins/typed-array.tq',
>>> +@@ -2845,7 +2844,10 @@
>>> + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-from-dsl-gen.cc',
>>> + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-from-dsl-gen.h',
>>> + ],
>>> +- 'action': ['<@(_inputs)', '-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated'],
>>> ++ 'action': [
>>> ++ 'torque',
>>> ++ '<@(_inputs)',
>>> ++ '-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated'],
>>> + },
>>> + ],
>>> + }, # torque
>>> +--
>>> +2.19.2
>>> +
>>> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0003-Link-atomic-library.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0003-Link-atomic-library.patch
>>> new file mode 100644
>>> index 000000000..66ff18b4a
>>> --- /dev/null
>>> +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0003-Link-atomic-library.patch
>>> @@ -0,0 +1,20 @@
>>> +Link atomic library to fix missing undefined referrences
>>> +like "undefined reference to `__atomic_fetch_add_8'"
>>> +
>>> +Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
>>> +
>>> +diff -Naur node-v10.15.1/deps/v8/gypfiles/v8.gyp node-v10.15.1/deps/v8/gypfiles/v8.gyp
>>> +--- node-v10.15.1/deps/v8/gypfiles/v8.gyp 2019-02-13 09:02:21.000000000 +0100
>>> ++++ node-v10.15.1/deps/v8/gypfiles/v8.gyp 2019-02-15 21:27:11.755679660 +0100
>>> +@@ -452,6 +452,11 @@
>>> + '<(DEPTH)',
>>> + '<(SHARED_INTERMEDIATE_DIR)'
>>> + ],
>>> ++ 'link_settings': {
>>> ++ 'libraries': [
>>> ++ '-latomic'
>>> ++ ],
>>> ++ },
>>> + 'sources': [
>>> + '<@(inspector_all_sources)',
>>> + '../include//v8-inspector-protocol.h',
>>> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_8.15.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
>>> similarity index 86%
>>> rename from meta-oe/recipes-devtools/nodejs/nodejs_8.15.0.bb
>>> rename to meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
>>> index 44eaee974..f2bfe8abe 100644
>>> --- a/meta-oe/recipes-devtools/nodejs/nodejs_8.15.0.bb
>>> +++ b/meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
>>> @@ -1,9 +1,10 @@
>>> DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript"
>>> HOMEPAGE = "http://nodejs.org"
>>> LICENSE = "MIT & BSD & Artistic-2.0"
>>> -LIC_FILES_CHKSUM = "file://LICENSE;md5=fde91d5c5bbd1e0389623e1ac018d9e8"
>>> +LIC_FILES_CHKSUM = "file://LICENSE;md5=9ceeba79eb2ea1067b7b3ed16fff8bab"
>>>
>>> DEPENDS = "openssl zlib icu"
>>> +DEPENDS_append_class-target = " nodejs-native"
>>>
>>> inherit pkgconfig
>>>
>>> @@ -13,9 +14,14 @@ COMPATIBLE_MACHINE_mips64 = "(!.*mips64).*"
>>>
>>> SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
>>> file://0001-Disable-running-gyp-files-for-bundled-deps.patch \
>>> -"
>>> -SRC_URI[md5sum] = "bfc5da493c72ded3a7f43b5662bfc53c"
>>> -SRC_URI[sha256sum] = "968523333947cc3f769d73dedc6c9c60580826d8714bc0e62ca4589de6a7c633"
>>> + file://0003-Link-atomic-library.patch \
>>> + "
>>> +SRC_URI_append_class-target = " \
>>> + file://0002-Using-native-torque.patch \
>>> + "
>>> +
>>> +SRC_URI[md5sum] = "1cad7963255de53509bfa560221bdc88"
>>> +SRC_URI[sha256sum] = "1a55f7b9fb80442182d9e1eba4fca4dac3c781cdcb25d6be37b24d253f61c858"
>>>
>>> S = "${WORKDIR}/node-v${PV}"
>>>
>>> @@ -74,6 +80,10 @@ do_install_append_class-native() {
>>> # use sed on npm-cli.js because otherwise symlink is replaced with normal file and
>>> # npm-cli.js continues to use old shebang
>>> sed "1s^.*^#\!/usr/bin/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js
>>> +
>>> + # Install the native torque to provide it within sysroot for the target compilation
>>> + install -d ${D}${bindir}
>>> + install -m 0755 ${S}/out/Release/torque ${D}${bindir}/torque
>>> }
>>>
>>> do_install_append_class-target() {
>>> --
>>> 2.11.0
>>>
>>> --
>>> _______________________________________________
>>> Openembedded-devel mailing list
>>> Openembedded-devel@lists.openembedded.org
>>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [meta-oe][PATCH v2] nodejs 8.15.0 -> 10.15.1
2019-02-16 7:54 ` Andrej Valek
@ 2019-02-16 8:34 ` Andrej Valek
2019-02-16 16:40 ` Khem Raj
0 siblings, 1 reply; 14+ messages in thread
From: Andrej Valek @ 2019-02-16 8:34 UTC (permalink / raw)
To: Khem Raj; +Cc: openembeded-devel
Hi Khem,
Maybe I have another question. Was it working before atomic, or is it a
different error?
Looks like, that c++11 support is required.
Andrej
On 2/16/19 8:54 AM, Andrej Valek wrote:
> Hi,
>
> I have set-up qemumips build, to check, if it's working or not.
> But, is it really strange, isn't it?
>
> What about just add it directly into ldflags, like "-Wl,--as-needed" ?
>
> Andrej
>
> On 2/16/19 7:35 AM, Khem Raj wrote:
>> here is link https://errors.yoctoproject.org/Errors/Details/228122/
>> On Fri, Feb 15, 2019 at 10:35 PM Khem Raj <raj.khem@gmail.com> wrote:
>>>
>>> On Fri, Feb 15, 2019 at 12:43 PM Andrej Valek <andrej.valek@siemens.com> wrote:
>>>>
>>>> Update nodejs to active 10.x LTS release 10.15.1.
>>>>
>>>
>>> nodejs-native fails on ubuntu 14.04 which has gcc 4.8, I wonder
>>> if there is a fix for this or do we expect it to not work
>>> with 4.8 compiler
>>>
>>>> Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
>>>> ---
>>>> ...isable-running-gyp-files-for-bundled-deps.patch | 23 ++++++--------
>>>> .../nodejs/nodejs/0002-Using-native-torque.patch | 36 ++++++++++++++++++++++
>>>> .../nodejs/nodejs/0003-Link-atomic-library.patch | 20 ++++++++++++
>>>> .../nodejs/{nodejs_8.15.0.bb => nodejs_10.15.1.bb} | 18 ++++++++---
>>>> 4 files changed, 80 insertions(+), 17 deletions(-)
>>>> create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch
>>>> create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0003-Link-atomic-library.patch
>>>> rename meta-oe/recipes-devtools/nodejs/{nodejs_8.15.0.bb => nodejs_10.15.1.bb} (86%)
>>>>
>>>> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
>>>> index 324a4683d..5d0dc03b6 100644
>>>> --- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
>>>> +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
>>>> @@ -4,26 +4,23 @@ 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(-)
>>>> + Makefile | 4 ++--
>>>> + 1 file changed, 2 insertions(+), 2 deletions(-)
>>>>
>>>> diff --git a/Makefile b/Makefile
>>>> -index 0a217bd893..e1229ad07f 100644
>>>> +index a98772f..f5663e2 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
>>>> +@@ -123,8 +123,8 @@ with-code-cache:
>>>> + test-code-cache: with-code-cache
>>>> + $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) code-cache
>>>>
>>>> -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
>>>> ++ deps/v8/gypfiles/toolchain.gypi \
>>>> + deps/v8/gypfiles/features.gypi deps/v8/gypfiles/v8.gyp node.gyp \
>>>> + config.gypi
>>>> $(PYTHON) tools/gyp_node.py -f make
>>>> -
>>>> - config.gypi: configure
>>>> --
>>>> -2.12.2
>>>> +2.19.2
>>>> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch
>>>> new file mode 100644
>>>> index 000000000..e9035f9eb
>>>> --- /dev/null
>>>> +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch
>>>> @@ -0,0 +1,36 @@
>>>> +From 4bbee5e3d58bc4911999f3ec2cc5aab8ded6717b Mon Sep 17 00:00:00 2001
>>>> +From: "Winker Matthias (TT-CA/ENG1)" <Matthias.Winker@de.bosch.com>
>>>> +Date: Tue, 11 Dec 2018 10:44:29 +0100
>>>> +Subject: [PATCH] Using native torque
>>>> +
>>>> +---
>>>> + deps/v8/gypfiles/v8.gyp | 6 ++++--
>>>> + 1 file changed, 4 insertions(+), 2 deletions(-)
>>>> +
>>>> +diff --git a/deps/v8/gypfiles/v8.gyp b/deps/v8/gypfiles/v8.gyp
>>>> +index 8c78f02255..434168844e 100644
>>>> +--- a/deps/v8/gypfiles/v8.gyp
>>>> ++++ b/deps/v8/gypfiles/v8.gyp
>>>> +@@ -2831,7 +2831,6 @@
>>>> + {
>>>> + 'action_name': 'run_torque',
>>>> + 'inputs': [ # Order matters.
>>>> +- '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)torque<(EXECUTABLE_SUFFIX)',
>>>> + '../src/builtins/base.tq',
>>>> + '../src/builtins/array.tq',
>>>> + '../src/builtins/typed-array.tq',
>>>> +@@ -2845,7 +2844,10 @@
>>>> + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-from-dsl-gen.cc',
>>>> + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-from-dsl-gen.h',
>>>> + ],
>>>> +- 'action': ['<@(_inputs)', '-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated'],
>>>> ++ 'action': [
>>>> ++ 'torque',
>>>> ++ '<@(_inputs)',
>>>> ++ '-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated'],
>>>> + },
>>>> + ],
>>>> + }, # torque
>>>> +--
>>>> +2.19.2
>>>> +
>>>> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0003-Link-atomic-library.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0003-Link-atomic-library.patch
>>>> new file mode 100644
>>>> index 000000000..66ff18b4a
>>>> --- /dev/null
>>>> +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0003-Link-atomic-library.patch
>>>> @@ -0,0 +1,20 @@
>>>> +Link atomic library to fix missing undefined referrences
>>>> +like "undefined reference to `__atomic_fetch_add_8'"
>>>> +
>>>> +Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
>>>> +
>>>> +diff -Naur node-v10.15.1/deps/v8/gypfiles/v8.gyp node-v10.15.1/deps/v8/gypfiles/v8.gyp
>>>> +--- node-v10.15.1/deps/v8/gypfiles/v8.gyp 2019-02-13 09:02:21.000000000 +0100
>>>> ++++ node-v10.15.1/deps/v8/gypfiles/v8.gyp 2019-02-15 21:27:11.755679660 +0100
>>>> +@@ -452,6 +452,11 @@
>>>> + '<(DEPTH)',
>>>> + '<(SHARED_INTERMEDIATE_DIR)'
>>>> + ],
>>>> ++ 'link_settings': {
>>>> ++ 'libraries': [
>>>> ++ '-latomic'
>>>> ++ ],
>>>> ++ },
>>>> + 'sources': [
>>>> + '<@(inspector_all_sources)',
>>>> + '../include//v8-inspector-protocol.h',
>>>> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_8.15.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
>>>> similarity index 86%
>>>> rename from meta-oe/recipes-devtools/nodejs/nodejs_8.15.0.bb
>>>> rename to meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
>>>> index 44eaee974..f2bfe8abe 100644
>>>> --- a/meta-oe/recipes-devtools/nodejs/nodejs_8.15.0.bb
>>>> +++ b/meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
>>>> @@ -1,9 +1,10 @@
>>>> DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript"
>>>> HOMEPAGE = "http://nodejs.org"
>>>> LICENSE = "MIT & BSD & Artistic-2.0"
>>>> -LIC_FILES_CHKSUM = "file://LICENSE;md5=fde91d5c5bbd1e0389623e1ac018d9e8"
>>>> +LIC_FILES_CHKSUM = "file://LICENSE;md5=9ceeba79eb2ea1067b7b3ed16fff8bab"
>>>>
>>>> DEPENDS = "openssl zlib icu"
>>>> +DEPENDS_append_class-target = " nodejs-native"
>>>>
>>>> inherit pkgconfig
>>>>
>>>> @@ -13,9 +14,14 @@ COMPATIBLE_MACHINE_mips64 = "(!.*mips64).*"
>>>>
>>>> SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
>>>> file://0001-Disable-running-gyp-files-for-bundled-deps.patch \
>>>> -"
>>>> -SRC_URI[md5sum] = "bfc5da493c72ded3a7f43b5662bfc53c"
>>>> -SRC_URI[sha256sum] = "968523333947cc3f769d73dedc6c9c60580826d8714bc0e62ca4589de6a7c633"
>>>> + file://0003-Link-atomic-library.patch \
>>>> + "
>>>> +SRC_URI_append_class-target = " \
>>>> + file://0002-Using-native-torque.patch \
>>>> + "
>>>> +
>>>> +SRC_URI[md5sum] = "1cad7963255de53509bfa560221bdc88"
>>>> +SRC_URI[sha256sum] = "1a55f7b9fb80442182d9e1eba4fca4dac3c781cdcb25d6be37b24d253f61c858"
>>>>
>>>> S = "${WORKDIR}/node-v${PV}"
>>>>
>>>> @@ -74,6 +80,10 @@ do_install_append_class-native() {
>>>> # use sed on npm-cli.js because otherwise symlink is replaced with normal file and
>>>> # npm-cli.js continues to use old shebang
>>>> sed "1s^.*^#\!/usr/bin/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js
>>>> +
>>>> + # Install the native torque to provide it within sysroot for the target compilation
>>>> + install -d ${D}${bindir}
>>>> + install -m 0755 ${S}/out/Release/torque ${D}${bindir}/torque
>>>> }
>>>>
>>>> do_install_append_class-target() {
>>>> --
>>>> 2.11.0
>>>>
>>>> --
>>>> _______________________________________________
>>>> Openembedded-devel mailing list
>>>> Openembedded-devel@lists.openembedded.org
>>>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [meta-oe][PATCH v2] nodejs 8.15.0 -> 10.15.1
2019-02-16 8:34 ` Andrej Valek
@ 2019-02-16 16:40 ` Khem Raj
0 siblings, 0 replies; 14+ messages in thread
From: Khem Raj @ 2019-02-16 16:40 UTC (permalink / raw)
To: Andrej Valek; +Cc: openembeded-devel
On Sat, Feb 16, 2019 at 12:34 AM Andrej Valek <andrej.valek@siemens.com> wrote:
>
> Hi Khem,
>
> Maybe I have another question. Was it working before atomic, or is it a
> different error?
>
it is different and happens with v2
> Looks like, that c++11 support is required.
>
>
> Andrej
>
> On 2/16/19 8:54 AM, Andrej Valek wrote:
> > Hi,
> >
> > I have set-up qemumips build, to check, if it's working or not.
> > But, is it really strange, isn't it?
> >
> > What about just add it directly into ldflags, like "-Wl,--as-needed" ?
> >
> > Andrej
> >
> > On 2/16/19 7:35 AM, Khem Raj wrote:
> >> here is link https://errors.yoctoproject.org/Errors/Details/228122/
> >> On Fri, Feb 15, 2019 at 10:35 PM Khem Raj <raj.khem@gmail.com> wrote:
> >>>
> >>> On Fri, Feb 15, 2019 at 12:43 PM Andrej Valek <andrej.valek@siemens.com> wrote:
> >>>>
> >>>> Update nodejs to active 10.x LTS release 10.15.1.
> >>>>
> >>>
> >>> nodejs-native fails on ubuntu 14.04 which has gcc 4.8, I wonder
> >>> if there is a fix for this or do we expect it to not work
> >>> with 4.8 compiler
> >>>
> >>>> Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
> >>>> ---
> >>>> ...isable-running-gyp-files-for-bundled-deps.patch | 23 ++++++--------
> >>>> .../nodejs/nodejs/0002-Using-native-torque.patch | 36 ++++++++++++++++++++++
> >>>> .../nodejs/nodejs/0003-Link-atomic-library.patch | 20 ++++++++++++
> >>>> .../nodejs/{nodejs_8.15.0.bb => nodejs_10.15.1.bb} | 18 ++++++++---
> >>>> 4 files changed, 80 insertions(+), 17 deletions(-)
> >>>> create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch
> >>>> create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0003-Link-atomic-library.patch
> >>>> rename meta-oe/recipes-devtools/nodejs/{nodejs_8.15.0.bb => nodejs_10.15.1.bb} (86%)
> >>>>
> >>>> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
> >>>> index 324a4683d..5d0dc03b6 100644
> >>>> --- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
> >>>> +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
> >>>> @@ -4,26 +4,23 @@ 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(-)
> >>>> + Makefile | 4 ++--
> >>>> + 1 file changed, 2 insertions(+), 2 deletions(-)
> >>>>
> >>>> diff --git a/Makefile b/Makefile
> >>>> -index 0a217bd893..e1229ad07f 100644
> >>>> +index a98772f..f5663e2 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
> >>>> +@@ -123,8 +123,8 @@ with-code-cache:
> >>>> + test-code-cache: with-code-cache
> >>>> + $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) code-cache
> >>>>
> >>>> -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
> >>>> ++ deps/v8/gypfiles/toolchain.gypi \
> >>>> + deps/v8/gypfiles/features.gypi deps/v8/gypfiles/v8.gyp node.gyp \
> >>>> + config.gypi
> >>>> $(PYTHON) tools/gyp_node.py -f make
> >>>> -
> >>>> - config.gypi: configure
> >>>> --
> >>>> -2.12.2
> >>>> +2.19.2
> >>>> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch
> >>>> new file mode 100644
> >>>> index 000000000..e9035f9eb
> >>>> --- /dev/null
> >>>> +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch
> >>>> @@ -0,0 +1,36 @@
> >>>> +From 4bbee5e3d58bc4911999f3ec2cc5aab8ded6717b Mon Sep 17 00:00:00 2001
> >>>> +From: "Winker Matthias (TT-CA/ENG1)" <Matthias.Winker@de.bosch.com>
> >>>> +Date: Tue, 11 Dec 2018 10:44:29 +0100
> >>>> +Subject: [PATCH] Using native torque
> >>>> +
> >>>> +---
> >>>> + deps/v8/gypfiles/v8.gyp | 6 ++++--
> >>>> + 1 file changed, 4 insertions(+), 2 deletions(-)
> >>>> +
> >>>> +diff --git a/deps/v8/gypfiles/v8.gyp b/deps/v8/gypfiles/v8.gyp
> >>>> +index 8c78f02255..434168844e 100644
> >>>> +--- a/deps/v8/gypfiles/v8.gyp
> >>>> ++++ b/deps/v8/gypfiles/v8.gyp
> >>>> +@@ -2831,7 +2831,6 @@
> >>>> + {
> >>>> + 'action_name': 'run_torque',
> >>>> + 'inputs': [ # Order matters.
> >>>> +- '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)torque<(EXECUTABLE_SUFFIX)',
> >>>> + '../src/builtins/base.tq',
> >>>> + '../src/builtins/array.tq',
> >>>> + '../src/builtins/typed-array.tq',
> >>>> +@@ -2845,7 +2844,10 @@
> >>>> + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-from-dsl-gen.cc',
> >>>> + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-from-dsl-gen.h',
> >>>> + ],
> >>>> +- 'action': ['<@(_inputs)', '-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated'],
> >>>> ++ 'action': [
> >>>> ++ 'torque',
> >>>> ++ '<@(_inputs)',
> >>>> ++ '-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated'],
> >>>> + },
> >>>> + ],
> >>>> + }, # torque
> >>>> +--
> >>>> +2.19.2
> >>>> +
> >>>> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0003-Link-atomic-library.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0003-Link-atomic-library.patch
> >>>> new file mode 100644
> >>>> index 000000000..66ff18b4a
> >>>> --- /dev/null
> >>>> +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0003-Link-atomic-library.patch
> >>>> @@ -0,0 +1,20 @@
> >>>> +Link atomic library to fix missing undefined referrences
> >>>> +like "undefined reference to `__atomic_fetch_add_8'"
> >>>> +
> >>>> +Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
> >>>> +
> >>>> +diff -Naur node-v10.15.1/deps/v8/gypfiles/v8.gyp node-v10.15.1/deps/v8/gypfiles/v8.gyp
> >>>> +--- node-v10.15.1/deps/v8/gypfiles/v8.gyp 2019-02-13 09:02:21.000000000 +0100
> >>>> ++++ node-v10.15.1/deps/v8/gypfiles/v8.gyp 2019-02-15 21:27:11.755679660 +0100
> >>>> +@@ -452,6 +452,11 @@
> >>>> + '<(DEPTH)',
> >>>> + '<(SHARED_INTERMEDIATE_DIR)'
> >>>> + ],
> >>>> ++ 'link_settings': {
> >>>> ++ 'libraries': [
> >>>> ++ '-latomic'
> >>>> ++ ],
> >>>> ++ },
> >>>> + 'sources': [
> >>>> + '<@(inspector_all_sources)',
> >>>> + '../include//v8-inspector-protocol.h',
> >>>> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_8.15.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
> >>>> similarity index 86%
> >>>> rename from meta-oe/recipes-devtools/nodejs/nodejs_8.15.0.bb
> >>>> rename to meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
> >>>> index 44eaee974..f2bfe8abe 100644
> >>>> --- a/meta-oe/recipes-devtools/nodejs/nodejs_8.15.0.bb
> >>>> +++ b/meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
> >>>> @@ -1,9 +1,10 @@
> >>>> DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript"
> >>>> HOMEPAGE = "http://nodejs.org"
> >>>> LICENSE = "MIT & BSD & Artistic-2.0"
> >>>> -LIC_FILES_CHKSUM = "file://LICENSE;md5=fde91d5c5bbd1e0389623e1ac018d9e8"
> >>>> +LIC_FILES_CHKSUM = "file://LICENSE;md5=9ceeba79eb2ea1067b7b3ed16fff8bab"
> >>>>
> >>>> DEPENDS = "openssl zlib icu"
> >>>> +DEPENDS_append_class-target = " nodejs-native"
> >>>>
> >>>> inherit pkgconfig
> >>>>
> >>>> @@ -13,9 +14,14 @@ COMPATIBLE_MACHINE_mips64 = "(!.*mips64).*"
> >>>>
> >>>> SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
> >>>> file://0001-Disable-running-gyp-files-for-bundled-deps.patch \
> >>>> -"
> >>>> -SRC_URI[md5sum] = "bfc5da493c72ded3a7f43b5662bfc53c"
> >>>> -SRC_URI[sha256sum] = "968523333947cc3f769d73dedc6c9c60580826d8714bc0e62ca4589de6a7c633"
> >>>> + file://0003-Link-atomic-library.patch \
> >>>> + "
> >>>> +SRC_URI_append_class-target = " \
> >>>> + file://0002-Using-native-torque.patch \
> >>>> + "
> >>>> +
> >>>> +SRC_URI[md5sum] = "1cad7963255de53509bfa560221bdc88"
> >>>> +SRC_URI[sha256sum] = "1a55f7b9fb80442182d9e1eba4fca4dac3c781cdcb25d6be37b24d253f61c858"
> >>>>
> >>>> S = "${WORKDIR}/node-v${PV}"
> >>>>
> >>>> @@ -74,6 +80,10 @@ do_install_append_class-native() {
> >>>> # use sed on npm-cli.js because otherwise symlink is replaced with normal file and
> >>>> # npm-cli.js continues to use old shebang
> >>>> sed "1s^.*^#\!/usr/bin/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js
> >>>> +
> >>>> + # Install the native torque to provide it within sysroot for the target compilation
> >>>> + install -d ${D}${bindir}
> >>>> + install -m 0755 ${S}/out/Release/torque ${D}${bindir}/torque
> >>>> }
> >>>>
> >>>> do_install_append_class-target() {
> >>>> --
> >>>> 2.11.0
> >>>>
> >>>> --
> >>>> _______________________________________________
> >>>> Openembedded-devel mailing list
> >>>> Openembedded-devel@lists.openembedded.org
> >>>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 14+ messages in thread
* [meta-oe][PATCH v3] nodejs 8.15.0 -> 10.15.1
2019-02-14 14:53 ` [meta-oe][PATCH] " Andrej Valek
2019-02-15 14:40 ` Khem Raj
2019-02-15 20:42 ` [meta-oe][PATCH v2] " Andrej Valek
@ 2019-02-17 9:12 ` Andrej Valek
2019-02-17 11:03 ` [meta-oe][PATCH v4] " Andrej Valek
2019-02-21 15:29 ` [meta-oe][PATCH v5] " Andrej Valek
4 siblings, 0 replies; 14+ messages in thread
From: Andrej Valek @ 2019-02-17 9:12 UTC (permalink / raw)
To: openembedded-devel
Update nodejs to active 10.x LTS release 10.15.1.
- link atomic library
- make it compatible with gcc < 4.9
Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
---
...isable-running-gyp-files-for-bundled-deps.patch | 23 ++--
.../nodejs/nodejs/0002-Using-native-torque.patch | 36 ++++++
...3-Crypto-reduce-memory-usage-of-SignFinal.patch | 122 +++++++++++++++++++++
.../0004-Make-compatibility-with-gcc-4.8.patch | 28 +++++
.../nodejs/nodejs/0005-Link-atomic-library.patch | 20 ++++
.../nodejs/{nodejs_8.15.0.bb => nodejs_10.15.1.bb} | 20 +++-
6 files changed, 232 insertions(+), 17 deletions(-)
create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch
create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0003-Crypto-reduce-memory-usage-of-SignFinal.patch
create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0004-Make-compatibility-with-gcc-4.8.patch
create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0005-Link-atomic-library.patch
rename meta-oe/recipes-devtools/nodejs/{nodejs_8.15.0.bb => nodejs_10.15.1.bb} (83%)
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
index 324a4683d..5d0dc03b6 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
@@ -4,26 +4,23 @@ 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(-)
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
-index 0a217bd893..e1229ad07f 100644
+index a98772f..f5663e2 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
+@@ -123,8 +123,8 @@ with-code-cache:
+ test-code-cache: with-code-cache
+ $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) code-cache
-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
++ deps/v8/gypfiles/toolchain.gypi \
+ deps/v8/gypfiles/features.gypi deps/v8/gypfiles/v8.gyp node.gyp \
+ config.gypi
$(PYTHON) tools/gyp_node.py -f make
-
- config.gypi: configure
--
-2.12.2
+2.19.2
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch
new file mode 100644
index 000000000..e9035f9eb
--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch
@@ -0,0 +1,36 @@
+From 4bbee5e3d58bc4911999f3ec2cc5aab8ded6717b Mon Sep 17 00:00:00 2001
+From: "Winker Matthias (TT-CA/ENG1)" <Matthias.Winker@de.bosch.com>
+Date: Tue, 11 Dec 2018 10:44:29 +0100
+Subject: [PATCH] Using native torque
+
+---
+ deps/v8/gypfiles/v8.gyp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/deps/v8/gypfiles/v8.gyp b/deps/v8/gypfiles/v8.gyp
+index 8c78f02255..434168844e 100644
+--- a/deps/v8/gypfiles/v8.gyp
++++ b/deps/v8/gypfiles/v8.gyp
+@@ -2831,7 +2831,6 @@
+ {
+ 'action_name': 'run_torque',
+ 'inputs': [ # Order matters.
+- '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)torque<(EXECUTABLE_SUFFIX)',
+ '../src/builtins/base.tq',
+ '../src/builtins/array.tq',
+ '../src/builtins/typed-array.tq',
+@@ -2845,7 +2844,10 @@
+ '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-from-dsl-gen.cc',
+ '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-from-dsl-gen.h',
+ ],
+- 'action': ['<@(_inputs)', '-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated'],
++ 'action': [
++ 'torque',
++ '<@(_inputs)',
++ '-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated'],
+ },
+ ],
+ }, # torque
+--
+2.19.2
+
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0003-Crypto-reduce-memory-usage-of-SignFinal.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0003-Crypto-reduce-memory-usage-of-SignFinal.patch
new file mode 100644
index 000000000..ed3bac39b
--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0003-Crypto-reduce-memory-usage-of-SignFinal.patch
@@ -0,0 +1,122 @@
+From 20282b1cb0389553421c4c5b14de198c5dfff50b Mon Sep 17 00:00:00 2001
+From: Anna Henningsen <anna@addaleax.net>
+Date: Sat, 20 Oct 2018 05:24:54 +0200
+Subject: [PATCH] src: use more explicit return type in Sign::SignFinal()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Using the non-indexed variant of `std::get<>` broke Travis CI.
+Also, this allows us to be a bit more concise when returning
+from `SignFinal()` due to some error condition.
+
+Refs: https://github.com/nodejs/node/pull/23427
+
+PR-URL: https://github.com/nodejs/node/pull/23779
+Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
+Reviewed-By: Tobias Nießen <tniessen@tnie.de>
+Reviewed-By: Refael Ackermann <refack@gmail.com>
+Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
+---
+ src/node_crypto.cc | 23 +++++++++++------------
+ src/node_crypto.h | 12 +++++++++++-
+ 2 files changed, 22 insertions(+), 13 deletions(-)
+
+diff --git a/src/node_crypto.cc b/src/node_crypto.cc
+index bd8d9e032554..ec7d4f2bb5be 100644
+--- a/src/node_crypto.cc
++++ b/src/node_crypto.cc
+@@ -3562,22 +3562,20 @@ static MallocedBuffer<unsigned char> Node_SignFinal(EVPMDPointer&& mdctx,
+ return MallocedBuffer<unsigned char>();
+ }
+
+-std::pair<SignBase::Error, MallocedBuffer<unsigned char>> Sign::SignFinal(
++Sign::SignResult Sign::SignFinal(
+ const char* key_pem,
+ int key_pem_len,
+ const char* passphrase,
+ int padding,
+ int salt_len) {
+- MallocedBuffer<unsigned char> buffer;
+-
+ if (!mdctx_)
+- return std::make_pair(kSignNotInitialised, std::move(buffer));
++ return SignResult(kSignNotInitialised);
+
+ EVPMDPointer mdctx = std::move(mdctx_);
+
+ BIOPointer bp(BIO_new_mem_buf(const_cast<char*>(key_pem), key_pem_len));
+ if (!bp)
+- return std::make_pair(kSignPrivateKey, std::move(buffer));
++ return SignResult(kSignPrivateKey);
+
+ EVPKeyPointer pkey(PEM_read_bio_PrivateKey(bp.get(),
+ nullptr,
+@@ -3588,7 +3586,7 @@ std::pair<SignBase::Error, MallocedBuffer<unsigned char>> Sign::SignFinal(
+ // without `pkey` being set to nullptr;
+ // cf. the test of `test_bad_rsa_privkey.pem` for an example.
+ if (!pkey || 0 != ERR_peek_error())
+- return std::make_pair(kSignPrivateKey, std::move(buffer));
++ return SignResult(kSignPrivateKey);
+
+ #ifdef NODE_FIPS_MODE
+ /* Validate DSA2 parameters from FIPS 186-4 */
+@@ -3612,9 +3610,10 @@ std::pair<SignBase::Error, MallocedBuffer<unsigned char>> Sign::SignFinal(
+ }
+ #endif // NODE_FIPS_MODE
+
+- buffer = Node_SignFinal(std::move(mdctx), pkey, padding, salt_len);
++ MallocedBuffer<unsigned char> buffer =
++ Node_SignFinal(std::move(mdctx), pkey, padding, salt_len);
+ Error error = buffer.is_empty() ? kSignPrivateKey : kSignOk;
+- return std::make_pair(error, std::move(buffer));
++ return SignResult(error, std::move(buffer));
+ }
+
+
+@@ -3639,18 +3638,18 @@ void Sign::SignFinal(const FunctionCallbackInfo<Value>& args) {
+
+ ClearErrorOnReturn clear_error_on_return;
+
+- std::pair<Error, MallocedBuffer<unsigned char>> ret = sign->SignFinal(
++ SignResult ret = sign->SignFinal(
+ buf,
+ buf_len,
+ len >= 2 && !args[1]->IsNull() ? *passphrase : nullptr,
+ padding,
+ salt_len);
+
+- if (std::get<Error>(ret) != kSignOk)
+- return sign->CheckThrow(std::get<Error>(ret));
++ if (ret.error != kSignOk)
++ return sign->CheckThrow(ret.error);
+
+ MallocedBuffer<unsigned char> sig =
+- std::move(std::get<MallocedBuffer<unsigned char>>(ret));
++ std::move(ret.signature);
+
+ Local<Object> rc =
+ Buffer::New(env, reinterpret_cast<char*>(sig.release()), sig.size)
+diff --git a/src/node_crypto.h b/src/node_crypto.h
+index 6fcf737f6c43..0c26c1f6ff1d 100644
+--- a/src/node_crypto.h
++++ b/src/node_crypto.h
+@@ -518,7 +518,17 @@ class Sign : public SignBase {
+ public:
+ static void Initialize(Environment* env, v8::Local<v8::Object> target);
+
+- std::pair<Error, MallocedBuffer<unsigned char>> SignFinal(
++ struct SignResult {
++ Error error;
++ MallocedBuffer<unsigned char> signature;
++
++ explicit SignResult(
++ Error err,
++ MallocedBuffer<unsigned char>&& sig = MallocedBuffer<unsigned char>())
++ : error(err), signature(std::move(sig)) {}
++ };
++
++ SignResult SignFinal(
+ const char* key_pem,
+ int key_pem_len,
+ const char* passphrase,
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0004-Make-compatibility-with-gcc-4.8.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0004-Make-compatibility-with-gcc-4.8.patch
new file mode 100644
index 000000000..7d23076df
--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0004-Make-compatibility-with-gcc-4.8.patch
@@ -0,0 +1,28 @@
+Implement function as wrapper for std::make_unique
+method to be compatible with gcc < 4.9 .
+"error::make_unique is not a member of 'std'"
+
+Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
+
+diff -Naur node-v10.15.1/src/cares_wrap.cc node-v10.15.1/src/cares_wrap.cc
+--- node-v10.15.1/src/cares_wrap.cc 2019-02-17 09:40:36.040538319 +0100
++++ node-v10.15.1/src/cares_wrap.cc 2019-02-17 09:39:57.883668702 +0100
+@@ -52,6 +52,18 @@
+ # define AI_V4MAPPED 0
+ #endif
+
++// implement make_unique for gcc < 4.9
++#if defined(__GNUC__) && (__GNUC___ < 4 || \
++ (__GNUC__ == 4 && __GNUC_MINOR__ < 9))
++namespace std {
++ template<typename T, typename... Args>
++ std::unique_ptr<T> make_unique(Args&&... args)
++ {
++ return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
++ }
++}
++#endif
++
+ namespace node {
+ namespace cares_wrap {
+
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0005-Link-atomic-library.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0005-Link-atomic-library.patch
new file mode 100644
index 000000000..66ff18b4a
--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0005-Link-atomic-library.patch
@@ -0,0 +1,20 @@
+Link atomic library to fix missing undefined referrences
+like "undefined reference to `__atomic_fetch_add_8'"
+
+Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
+
+diff -Naur node-v10.15.1/deps/v8/gypfiles/v8.gyp node-v10.15.1/deps/v8/gypfiles/v8.gyp
+--- node-v10.15.1/deps/v8/gypfiles/v8.gyp 2019-02-13 09:02:21.000000000 +0100
++++ node-v10.15.1/deps/v8/gypfiles/v8.gyp 2019-02-15 21:27:11.755679660 +0100
+@@ -452,6 +452,11 @@
+ '<(DEPTH)',
+ '<(SHARED_INTERMEDIATE_DIR)'
+ ],
++ 'link_settings': {
++ 'libraries': [
++ '-latomic'
++ ],
++ },
+ 'sources': [
+ '<@(inspector_all_sources)',
+ '../include//v8-inspector-protocol.h',
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_8.15.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
similarity index 83%
rename from meta-oe/recipes-devtools/nodejs/nodejs_8.15.0.bb
rename to meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
index 44eaee974..17c9bb0c4 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_8.15.0.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
@@ -1,9 +1,10 @@
DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript"
HOMEPAGE = "http://nodejs.org"
LICENSE = "MIT & BSD & Artistic-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=fde91d5c5bbd1e0389623e1ac018d9e8"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=9ceeba79eb2ea1067b7b3ed16fff8bab"
DEPENDS = "openssl zlib icu"
+DEPENDS_append_class-target = " nodejs-native"
inherit pkgconfig
@@ -13,9 +14,16 @@ COMPATIBLE_MACHINE_mips64 = "(!.*mips64).*"
SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
file://0001-Disable-running-gyp-files-for-bundled-deps.patch \
-"
-SRC_URI[md5sum] = "bfc5da493c72ded3a7f43b5662bfc53c"
-SRC_URI[sha256sum] = "968523333947cc3f769d73dedc6c9c60580826d8714bc0e62ca4589de6a7c633"
+ file://0003-Crypto-reduce-memory-usage-of-SignFinal.patch \
+ file://0004-Make-compatibility-with-gcc-4.8.patch \
+ file://0005-Link-atomic-library.patch \
+ "
+SRC_URI_append_class-target = " \
+ file://0002-Using-native-torque.patch \
+ "
+
+SRC_URI[md5sum] = "1cad7963255de53509bfa560221bdc88"
+SRC_URI[sha256sum] = "1a55f7b9fb80442182d9e1eba4fca4dac3c781cdcb25d6be37b24d253f61c858"
S = "${WORKDIR}/node-v${PV}"
@@ -74,6 +82,10 @@ do_install_append_class-native() {
# use sed on npm-cli.js because otherwise symlink is replaced with normal file and
# npm-cli.js continues to use old shebang
sed "1s^.*^#\!/usr/bin/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js
+
+ # Install the native torque to provide it within sysroot for the target compilation
+ install -d ${D}${bindir}
+ install -m 0755 ${S}/out/Release/torque ${D}${bindir}/torque
}
do_install_append_class-target() {
--
2.11.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [meta-oe][PATCH v4] nodejs 8.15.0 -> 10.15.1
2019-02-14 14:53 ` [meta-oe][PATCH] " Andrej Valek
` (2 preceding siblings ...)
2019-02-17 9:12 ` [meta-oe][PATCH v3] " Andrej Valek
@ 2019-02-17 11:03 ` Andrej Valek
2019-02-21 15:13 ` Khem Raj
2019-02-21 15:29 ` [meta-oe][PATCH v5] " Andrej Valek
4 siblings, 1 reply; 14+ messages in thread
From: Andrej Valek @ 2019-02-17 11:03 UTC (permalink / raw)
To: openembedded-devel
Update nodejs to active 10.x LTS release 10.15.1.
- link atomic library
- make it compatible with gcc < 4.9
Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
---
...isable-running-gyp-files-for-bundled-deps.patch | 23 ++--
.../nodejs/nodejs/0002-Using-native-torque.patch | 36 ++++++
...3-Crypto-reduce-memory-usage-of-SignFinal.patch | 122 +++++++++++++++++++++
.../0004-Make-compatibility-with-gcc-4.8.patch | 26 +++++
.../nodejs/nodejs/0005-Link-atomic-library.patch | 20 ++++
.../nodejs/{nodejs_8.15.0.bb => nodejs_10.15.1.bb} | 20 +++-
6 files changed, 230 insertions(+), 17 deletions(-)
create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch
create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0003-Crypto-reduce-memory-usage-of-SignFinal.patch
create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0004-Make-compatibility-with-gcc-4.8.patch
create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0005-Link-atomic-library.patch
rename meta-oe/recipes-devtools/nodejs/{nodejs_8.15.0.bb => nodejs_10.15.1.bb} (83%)
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
index 324a4683d..5d0dc03b6 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
@@ -4,26 +4,23 @@ 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(-)
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
-index 0a217bd893..e1229ad07f 100644
+index a98772f..f5663e2 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
+@@ -123,8 +123,8 @@ with-code-cache:
+ test-code-cache: with-code-cache
+ $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) code-cache
-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
++ deps/v8/gypfiles/toolchain.gypi \
+ deps/v8/gypfiles/features.gypi deps/v8/gypfiles/v8.gyp node.gyp \
+ config.gypi
$(PYTHON) tools/gyp_node.py -f make
-
- config.gypi: configure
--
-2.12.2
+2.19.2
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch
new file mode 100644
index 000000000..e9035f9eb
--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch
@@ -0,0 +1,36 @@
+From 4bbee5e3d58bc4911999f3ec2cc5aab8ded6717b Mon Sep 17 00:00:00 2001
+From: "Winker Matthias (TT-CA/ENG1)" <Matthias.Winker@de.bosch.com>
+Date: Tue, 11 Dec 2018 10:44:29 +0100
+Subject: [PATCH] Using native torque
+
+---
+ deps/v8/gypfiles/v8.gyp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/deps/v8/gypfiles/v8.gyp b/deps/v8/gypfiles/v8.gyp
+index 8c78f02255..434168844e 100644
+--- a/deps/v8/gypfiles/v8.gyp
++++ b/deps/v8/gypfiles/v8.gyp
+@@ -2831,7 +2831,6 @@
+ {
+ 'action_name': 'run_torque',
+ 'inputs': [ # Order matters.
+- '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)torque<(EXECUTABLE_SUFFIX)',
+ '../src/builtins/base.tq',
+ '../src/builtins/array.tq',
+ '../src/builtins/typed-array.tq',
+@@ -2845,7 +2844,10 @@
+ '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-from-dsl-gen.cc',
+ '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-from-dsl-gen.h',
+ ],
+- 'action': ['<@(_inputs)', '-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated'],
++ 'action': [
++ 'torque',
++ '<@(_inputs)',
++ '-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated'],
+ },
+ ],
+ }, # torque
+--
+2.19.2
+
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0003-Crypto-reduce-memory-usage-of-SignFinal.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0003-Crypto-reduce-memory-usage-of-SignFinal.patch
new file mode 100644
index 000000000..ed3bac39b
--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0003-Crypto-reduce-memory-usage-of-SignFinal.patch
@@ -0,0 +1,122 @@
+From 20282b1cb0389553421c4c5b14de198c5dfff50b Mon Sep 17 00:00:00 2001
+From: Anna Henningsen <anna@addaleax.net>
+Date: Sat, 20 Oct 2018 05:24:54 +0200
+Subject: [PATCH] src: use more explicit return type in Sign::SignFinal()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Using the non-indexed variant of `std::get<>` broke Travis CI.
+Also, this allows us to be a bit more concise when returning
+from `SignFinal()` due to some error condition.
+
+Refs: https://github.com/nodejs/node/pull/23427
+
+PR-URL: https://github.com/nodejs/node/pull/23779
+Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
+Reviewed-By: Tobias Nießen <tniessen@tnie.de>
+Reviewed-By: Refael Ackermann <refack@gmail.com>
+Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
+---
+ src/node_crypto.cc | 23 +++++++++++------------
+ src/node_crypto.h | 12 +++++++++++-
+ 2 files changed, 22 insertions(+), 13 deletions(-)
+
+diff --git a/src/node_crypto.cc b/src/node_crypto.cc
+index bd8d9e032554..ec7d4f2bb5be 100644
+--- a/src/node_crypto.cc
++++ b/src/node_crypto.cc
+@@ -3562,22 +3562,20 @@ static MallocedBuffer<unsigned char> Node_SignFinal(EVPMDPointer&& mdctx,
+ return MallocedBuffer<unsigned char>();
+ }
+
+-std::pair<SignBase::Error, MallocedBuffer<unsigned char>> Sign::SignFinal(
++Sign::SignResult Sign::SignFinal(
+ const char* key_pem,
+ int key_pem_len,
+ const char* passphrase,
+ int padding,
+ int salt_len) {
+- MallocedBuffer<unsigned char> buffer;
+-
+ if (!mdctx_)
+- return std::make_pair(kSignNotInitialised, std::move(buffer));
++ return SignResult(kSignNotInitialised);
+
+ EVPMDPointer mdctx = std::move(mdctx_);
+
+ BIOPointer bp(BIO_new_mem_buf(const_cast<char*>(key_pem), key_pem_len));
+ if (!bp)
+- return std::make_pair(kSignPrivateKey, std::move(buffer));
++ return SignResult(kSignPrivateKey);
+
+ EVPKeyPointer pkey(PEM_read_bio_PrivateKey(bp.get(),
+ nullptr,
+@@ -3588,7 +3586,7 @@ std::pair<SignBase::Error, MallocedBuffer<unsigned char>> Sign::SignFinal(
+ // without `pkey` being set to nullptr;
+ // cf. the test of `test_bad_rsa_privkey.pem` for an example.
+ if (!pkey || 0 != ERR_peek_error())
+- return std::make_pair(kSignPrivateKey, std::move(buffer));
++ return SignResult(kSignPrivateKey);
+
+ #ifdef NODE_FIPS_MODE
+ /* Validate DSA2 parameters from FIPS 186-4 */
+@@ -3612,9 +3610,10 @@ std::pair<SignBase::Error, MallocedBuffer<unsigned char>> Sign::SignFinal(
+ }
+ #endif // NODE_FIPS_MODE
+
+- buffer = Node_SignFinal(std::move(mdctx), pkey, padding, salt_len);
++ MallocedBuffer<unsigned char> buffer =
++ Node_SignFinal(std::move(mdctx), pkey, padding, salt_len);
+ Error error = buffer.is_empty() ? kSignPrivateKey : kSignOk;
+- return std::make_pair(error, std::move(buffer));
++ return SignResult(error, std::move(buffer));
+ }
+
+
+@@ -3639,18 +3638,18 @@ void Sign::SignFinal(const FunctionCallbackInfo<Value>& args) {
+
+ ClearErrorOnReturn clear_error_on_return;
+
+- std::pair<Error, MallocedBuffer<unsigned char>> ret = sign->SignFinal(
++ SignResult ret = sign->SignFinal(
+ buf,
+ buf_len,
+ len >= 2 && !args[1]->IsNull() ? *passphrase : nullptr,
+ padding,
+ salt_len);
+
+- if (std::get<Error>(ret) != kSignOk)
+- return sign->CheckThrow(std::get<Error>(ret));
++ if (ret.error != kSignOk)
++ return sign->CheckThrow(ret.error);
+
+ MallocedBuffer<unsigned char> sig =
+- std::move(std::get<MallocedBuffer<unsigned char>>(ret));
++ std::move(ret.signature);
+
+ Local<Object> rc =
+ Buffer::New(env, reinterpret_cast<char*>(sig.release()), sig.size)
+diff --git a/src/node_crypto.h b/src/node_crypto.h
+index 6fcf737f6c43..0c26c1f6ff1d 100644
+--- a/src/node_crypto.h
++++ b/src/node_crypto.h
+@@ -518,7 +518,17 @@ class Sign : public SignBase {
+ public:
+ static void Initialize(Environment* env, v8::Local<v8::Object> target);
+
+- std::pair<Error, MallocedBuffer<unsigned char>> SignFinal(
++ struct SignResult {
++ Error error;
++ MallocedBuffer<unsigned char> signature;
++
++ explicit SignResult(
++ Error err,
++ MallocedBuffer<unsigned char>&& sig = MallocedBuffer<unsigned char>())
++ : error(err), signature(std::move(sig)) {}
++ };
++
++ SignResult SignFinal(
+ const char* key_pem,
+ int key_pem_len,
+ const char* passphrase,
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0004-Make-compatibility-with-gcc-4.8.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0004-Make-compatibility-with-gcc-4.8.patch
new file mode 100644
index 000000000..2b325b675
--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0004-Make-compatibility-with-gcc-4.8.patch
@@ -0,0 +1,26 @@
+Implement function as wrapper for std::make_unique
+method to be compatible with gcc < 4.9 .
+"error::make_unique is not a member of 'std'"
+
+Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
+
+diff -Naur node-v10.15.1/src/cares_wrap.cc node-v10.15.1/src/cares_wrap.cc
+--- node-v10.15.1/src/cares_wrap.cc 2019-02-17 09:40:36.040538319 +0100
++++ node-v10.15.1/src/cares_wrap.cc 2019-02-17 09:39:57.883668702 +0100
+@@ -52,6 +52,16 @@
+ # define AI_V4MAPPED 0
+ #endif
+
++#ifndef __cpp_lib_make_unique
++ namespace std {
++ /// make_unique implementation
++ template<typename T, typename... Args>
++ std::unique_ptr<T> make_unique(Args&&... args) {
++ return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
++ }
++ }
++#endif
++
+ namespace node {
+ namespace cares_wrap {
+
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0005-Link-atomic-library.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0005-Link-atomic-library.patch
new file mode 100644
index 000000000..66ff18b4a
--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0005-Link-atomic-library.patch
@@ -0,0 +1,20 @@
+Link atomic library to fix missing undefined referrences
+like "undefined reference to `__atomic_fetch_add_8'"
+
+Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
+
+diff -Naur node-v10.15.1/deps/v8/gypfiles/v8.gyp node-v10.15.1/deps/v8/gypfiles/v8.gyp
+--- node-v10.15.1/deps/v8/gypfiles/v8.gyp 2019-02-13 09:02:21.000000000 +0100
++++ node-v10.15.1/deps/v8/gypfiles/v8.gyp 2019-02-15 21:27:11.755679660 +0100
+@@ -452,6 +452,11 @@
+ '<(DEPTH)',
+ '<(SHARED_INTERMEDIATE_DIR)'
+ ],
++ 'link_settings': {
++ 'libraries': [
++ '-latomic'
++ ],
++ },
+ 'sources': [
+ '<@(inspector_all_sources)',
+ '../include//v8-inspector-protocol.h',
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_8.15.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
similarity index 83%
rename from meta-oe/recipes-devtools/nodejs/nodejs_8.15.0.bb
rename to meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
index 44eaee974..17c9bb0c4 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_8.15.0.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
@@ -1,9 +1,10 @@
DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript"
HOMEPAGE = "http://nodejs.org"
LICENSE = "MIT & BSD & Artistic-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=fde91d5c5bbd1e0389623e1ac018d9e8"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=9ceeba79eb2ea1067b7b3ed16fff8bab"
DEPENDS = "openssl zlib icu"
+DEPENDS_append_class-target = " nodejs-native"
inherit pkgconfig
@@ -13,9 +14,16 @@ COMPATIBLE_MACHINE_mips64 = "(!.*mips64).*"
SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
file://0001-Disable-running-gyp-files-for-bundled-deps.patch \
-"
-SRC_URI[md5sum] = "bfc5da493c72ded3a7f43b5662bfc53c"
-SRC_URI[sha256sum] = "968523333947cc3f769d73dedc6c9c60580826d8714bc0e62ca4589de6a7c633"
+ file://0003-Crypto-reduce-memory-usage-of-SignFinal.patch \
+ file://0004-Make-compatibility-with-gcc-4.8.patch \
+ file://0005-Link-atomic-library.patch \
+ "
+SRC_URI_append_class-target = " \
+ file://0002-Using-native-torque.patch \
+ "
+
+SRC_URI[md5sum] = "1cad7963255de53509bfa560221bdc88"
+SRC_URI[sha256sum] = "1a55f7b9fb80442182d9e1eba4fca4dac3c781cdcb25d6be37b24d253f61c858"
S = "${WORKDIR}/node-v${PV}"
@@ -74,6 +82,10 @@ do_install_append_class-native() {
# use sed on npm-cli.js because otherwise symlink is replaced with normal file and
# npm-cli.js continues to use old shebang
sed "1s^.*^#\!/usr/bin/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js
+
+ # Install the native torque to provide it within sysroot for the target compilation
+ install -d ${D}${bindir}
+ install -m 0755 ${S}/out/Release/torque ${D}${bindir}/torque
}
do_install_append_class-target() {
--
2.11.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [meta-oe][PATCH v4] nodejs 8.15.0 -> 10.15.1
2019-02-17 11:03 ` [meta-oe][PATCH v4] " Andrej Valek
@ 2019-02-21 15:13 ` Khem Raj
0 siblings, 0 replies; 14+ messages in thread
From: Khem Raj @ 2019-02-21 15:13 UTC (permalink / raw)
To: Andrej Valek; +Cc: openembeded-devel
Andrej
It still fails with gcc 4.8/ubuntu-14.04 native
https://errors.yoctoproject.org/Errors/Details/229576/
../src/inspector_agent.cc: In member function ‘int
node::inspector::NodeInspectorClient::connectFrontend(std::unique_ptr<node::inspector::InspectorSessionDelegate>,
bool)’:
../src/inspector_agent.cc:479:9: error: ‘make_unique’ is not a member of ‘std’
std::make_unique<ChannelImpl>(env_, client_, getWorkerManager(),
^
../src/inspector_agent.cc:479:37: error: expected primary-expression
before ‘>’ token
std::make_unique<ChannelImpl>(env_, client_, getWorkerManager(),
^
../src/inspector_agent.cc:479:45: warning: left operand of comma
operator has no effect [-Wunused-value]
std::make_unique<ChannelImpl>(env_, client_, getWorkerManager(),
^
../src/inspector_agent.cc:479:71: warning: right operand of comma
operator has no effect [-Wunused-value]
std::make_unique<ChannelImpl>(env_, client_, getWorkerManager(),
^
can you see if there is a way out ?
On Sun, Feb 17, 2019 at 3:04 AM Andrej Valek <andrej.valek@siemens.com> wrote:
>
> Update nodejs to active 10.x LTS release 10.15.1.
> - link atomic library
> - make it compatible with gcc < 4.9
>
> Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
> ---
> ...isable-running-gyp-files-for-bundled-deps.patch | 23 ++--
> .../nodejs/nodejs/0002-Using-native-torque.patch | 36 ++++++
> ...3-Crypto-reduce-memory-usage-of-SignFinal.patch | 122 +++++++++++++++++++++
> .../0004-Make-compatibility-with-gcc-4.8.patch | 26 +++++
> .../nodejs/nodejs/0005-Link-atomic-library.patch | 20 ++++
> .../nodejs/{nodejs_8.15.0.bb => nodejs_10.15.1.bb} | 20 +++-
> 6 files changed, 230 insertions(+), 17 deletions(-)
> create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch
> create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0003-Crypto-reduce-memory-usage-of-SignFinal.patch
> create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0004-Make-compatibility-with-gcc-4.8.patch
> create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0005-Link-atomic-library.patch
> rename meta-oe/recipes-devtools/nodejs/{nodejs_8.15.0.bb => nodejs_10.15.1.bb} (83%)
>
> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
> index 324a4683d..5d0dc03b6 100644
> --- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
> +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
> @@ -4,26 +4,23 @@ 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(-)
> + Makefile | 4 ++--
> + 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Makefile b/Makefile
> -index 0a217bd893..e1229ad07f 100644
> +index a98772f..f5663e2 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
> +@@ -123,8 +123,8 @@ with-code-cache:
> + test-code-cache: with-code-cache
> + $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) code-cache
>
> -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
> ++ deps/v8/gypfiles/toolchain.gypi \
> + deps/v8/gypfiles/features.gypi deps/v8/gypfiles/v8.gyp node.gyp \
> + config.gypi
> $(PYTHON) tools/gyp_node.py -f make
> -
> - config.gypi: configure
> --
> -2.12.2
> +2.19.2
> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch
> new file mode 100644
> index 000000000..e9035f9eb
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch
> @@ -0,0 +1,36 @@
> +From 4bbee5e3d58bc4911999f3ec2cc5aab8ded6717b Mon Sep 17 00:00:00 2001
> +From: "Winker Matthias (TT-CA/ENG1)" <Matthias.Winker@de.bosch.com>
> +Date: Tue, 11 Dec 2018 10:44:29 +0100
> +Subject: [PATCH] Using native torque
> +
> +---
> + deps/v8/gypfiles/v8.gyp | 6 ++++--
> + 1 file changed, 4 insertions(+), 2 deletions(-)
> +
> +diff --git a/deps/v8/gypfiles/v8.gyp b/deps/v8/gypfiles/v8.gyp
> +index 8c78f02255..434168844e 100644
> +--- a/deps/v8/gypfiles/v8.gyp
> ++++ b/deps/v8/gypfiles/v8.gyp
> +@@ -2831,7 +2831,6 @@
> + {
> + 'action_name': 'run_torque',
> + 'inputs': [ # Order matters.
> +- '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)torque<(EXECUTABLE_SUFFIX)',
> + '../src/builtins/base.tq',
> + '../src/builtins/array.tq',
> + '../src/builtins/typed-array.tq',
> +@@ -2845,7 +2844,10 @@
> + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-from-dsl-gen.cc',
> + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-from-dsl-gen.h',
> + ],
> +- 'action': ['<@(_inputs)', '-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated'],
> ++ 'action': [
> ++ 'torque',
> ++ '<@(_inputs)',
> ++ '-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated'],
> + },
> + ],
> + }, # torque
> +--
> +2.19.2
> +
> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0003-Crypto-reduce-memory-usage-of-SignFinal.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0003-Crypto-reduce-memory-usage-of-SignFinal.patch
> new file mode 100644
> index 000000000..ed3bac39b
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0003-Crypto-reduce-memory-usage-of-SignFinal.patch
> @@ -0,0 +1,122 @@
> +From 20282b1cb0389553421c4c5b14de198c5dfff50b Mon Sep 17 00:00:00 2001
> +From: Anna Henningsen <anna@addaleax.net>
> +Date: Sat, 20 Oct 2018 05:24:54 +0200
> +Subject: [PATCH] src: use more explicit return type in Sign::SignFinal()
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +Using the non-indexed variant of `std::get<>` broke Travis CI.
> +Also, this allows us to be a bit more concise when returning
> +from `SignFinal()` due to some error condition.
> +
> +Refs: https://github.com/nodejs/node/pull/23427
> +
> +PR-URL: https://github.com/nodejs/node/pull/23779
> +Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
> +Reviewed-By: Tobias Nießen <tniessen@tnie.de>
> +Reviewed-By: Refael Ackermann <refack@gmail.com>
> +Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
> +---
> + src/node_crypto.cc | 23 +++++++++++------------
> + src/node_crypto.h | 12 +++++++++++-
> + 2 files changed, 22 insertions(+), 13 deletions(-)
> +
> +diff --git a/src/node_crypto.cc b/src/node_crypto.cc
> +index bd8d9e032554..ec7d4f2bb5be 100644
> +--- a/src/node_crypto.cc
> ++++ b/src/node_crypto.cc
> +@@ -3562,22 +3562,20 @@ static MallocedBuffer<unsigned char> Node_SignFinal(EVPMDPointer&& mdctx,
> + return MallocedBuffer<unsigned char>();
> + }
> +
> +-std::pair<SignBase::Error, MallocedBuffer<unsigned char>> Sign::SignFinal(
> ++Sign::SignResult Sign::SignFinal(
> + const char* key_pem,
> + int key_pem_len,
> + const char* passphrase,
> + int padding,
> + int salt_len) {
> +- MallocedBuffer<unsigned char> buffer;
> +-
> + if (!mdctx_)
> +- return std::make_pair(kSignNotInitialised, std::move(buffer));
> ++ return SignResult(kSignNotInitialised);
> +
> + EVPMDPointer mdctx = std::move(mdctx_);
> +
> + BIOPointer bp(BIO_new_mem_buf(const_cast<char*>(key_pem), key_pem_len));
> + if (!bp)
> +- return std::make_pair(kSignPrivateKey, std::move(buffer));
> ++ return SignResult(kSignPrivateKey);
> +
> + EVPKeyPointer pkey(PEM_read_bio_PrivateKey(bp.get(),
> + nullptr,
> +@@ -3588,7 +3586,7 @@ std::pair<SignBase::Error, MallocedBuffer<unsigned char>> Sign::SignFinal(
> + // without `pkey` being set to nullptr;
> + // cf. the test of `test_bad_rsa_privkey.pem` for an example.
> + if (!pkey || 0 != ERR_peek_error())
> +- return std::make_pair(kSignPrivateKey, std::move(buffer));
> ++ return SignResult(kSignPrivateKey);
> +
> + #ifdef NODE_FIPS_MODE
> + /* Validate DSA2 parameters from FIPS 186-4 */
> +@@ -3612,9 +3610,10 @@ std::pair<SignBase::Error, MallocedBuffer<unsigned char>> Sign::SignFinal(
> + }
> + #endif // NODE_FIPS_MODE
> +
> +- buffer = Node_SignFinal(std::move(mdctx), pkey, padding, salt_len);
> ++ MallocedBuffer<unsigned char> buffer =
> ++ Node_SignFinal(std::move(mdctx), pkey, padding, salt_len);
> + Error error = buffer.is_empty() ? kSignPrivateKey : kSignOk;
> +- return std::make_pair(error, std::move(buffer));
> ++ return SignResult(error, std::move(buffer));
> + }
> +
> +
> +@@ -3639,18 +3638,18 @@ void Sign::SignFinal(const FunctionCallbackInfo<Value>& args) {
> +
> + ClearErrorOnReturn clear_error_on_return;
> +
> +- std::pair<Error, MallocedBuffer<unsigned char>> ret = sign->SignFinal(
> ++ SignResult ret = sign->SignFinal(
> + buf,
> + buf_len,
> + len >= 2 && !args[1]->IsNull() ? *passphrase : nullptr,
> + padding,
> + salt_len);
> +
> +- if (std::get<Error>(ret) != kSignOk)
> +- return sign->CheckThrow(std::get<Error>(ret));
> ++ if (ret.error != kSignOk)
> ++ return sign->CheckThrow(ret.error);
> +
> + MallocedBuffer<unsigned char> sig =
> +- std::move(std::get<MallocedBuffer<unsigned char>>(ret));
> ++ std::move(ret.signature);
> +
> + Local<Object> rc =
> + Buffer::New(env, reinterpret_cast<char*>(sig.release()), sig.size)
> +diff --git a/src/node_crypto.h b/src/node_crypto.h
> +index 6fcf737f6c43..0c26c1f6ff1d 100644
> +--- a/src/node_crypto.h
> ++++ b/src/node_crypto.h
> +@@ -518,7 +518,17 @@ class Sign : public SignBase {
> + public:
> + static void Initialize(Environment* env, v8::Local<v8::Object> target);
> +
> +- std::pair<Error, MallocedBuffer<unsigned char>> SignFinal(
> ++ struct SignResult {
> ++ Error error;
> ++ MallocedBuffer<unsigned char> signature;
> ++
> ++ explicit SignResult(
> ++ Error err,
> ++ MallocedBuffer<unsigned char>&& sig = MallocedBuffer<unsigned char>())
> ++ : error(err), signature(std::move(sig)) {}
> ++ };
> ++
> ++ SignResult SignFinal(
> + const char* key_pem,
> + int key_pem_len,
> + const char* passphrase,
> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0004-Make-compatibility-with-gcc-4.8.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0004-Make-compatibility-with-gcc-4.8.patch
> new file mode 100644
> index 000000000..2b325b675
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0004-Make-compatibility-with-gcc-4.8.patch
> @@ -0,0 +1,26 @@
> +Implement function as wrapper for std::make_unique
> +method to be compatible with gcc < 4.9 .
> +"error::make_unique is not a member of 'std'"
> +
> +Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
> +
> +diff -Naur node-v10.15.1/src/cares_wrap.cc node-v10.15.1/src/cares_wrap.cc
> +--- node-v10.15.1/src/cares_wrap.cc 2019-02-17 09:40:36.040538319 +0100
> ++++ node-v10.15.1/src/cares_wrap.cc 2019-02-17 09:39:57.883668702 +0100
> +@@ -52,6 +52,16 @@
> + # define AI_V4MAPPED 0
> + #endif
> +
> ++#ifndef __cpp_lib_make_unique
> ++ namespace std {
> ++ /// make_unique implementation
> ++ template<typename T, typename... Args>
> ++ std::unique_ptr<T> make_unique(Args&&... args) {
> ++ return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
> ++ }
> ++ }
> ++#endif
> ++
> + namespace node {
> + namespace cares_wrap {
> +
> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0005-Link-atomic-library.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0005-Link-atomic-library.patch
> new file mode 100644
> index 000000000..66ff18b4a
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0005-Link-atomic-library.patch
> @@ -0,0 +1,20 @@
> +Link atomic library to fix missing undefined referrences
> +like "undefined reference to `__atomic_fetch_add_8'"
> +
> +Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
> +
> +diff -Naur node-v10.15.1/deps/v8/gypfiles/v8.gyp node-v10.15.1/deps/v8/gypfiles/v8.gyp
> +--- node-v10.15.1/deps/v8/gypfiles/v8.gyp 2019-02-13 09:02:21.000000000 +0100
> ++++ node-v10.15.1/deps/v8/gypfiles/v8.gyp 2019-02-15 21:27:11.755679660 +0100
> +@@ -452,6 +452,11 @@
> + '<(DEPTH)',
> + '<(SHARED_INTERMEDIATE_DIR)'
> + ],
> ++ 'link_settings': {
> ++ 'libraries': [
> ++ '-latomic'
> ++ ],
> ++ },
> + 'sources': [
> + '<@(inspector_all_sources)',
> + '../include//v8-inspector-protocol.h',
> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_8.15.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
> similarity index 83%
> rename from meta-oe/recipes-devtools/nodejs/nodejs_8.15.0.bb
> rename to meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
> index 44eaee974..17c9bb0c4 100644
> --- a/meta-oe/recipes-devtools/nodejs/nodejs_8.15.0.bb
> +++ b/meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
> @@ -1,9 +1,10 @@
> DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript"
> HOMEPAGE = "http://nodejs.org"
> LICENSE = "MIT & BSD & Artistic-2.0"
> -LIC_FILES_CHKSUM = "file://LICENSE;md5=fde91d5c5bbd1e0389623e1ac018d9e8"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=9ceeba79eb2ea1067b7b3ed16fff8bab"
>
> DEPENDS = "openssl zlib icu"
> +DEPENDS_append_class-target = " nodejs-native"
>
> inherit pkgconfig
>
> @@ -13,9 +14,16 @@ COMPATIBLE_MACHINE_mips64 = "(!.*mips64).*"
>
> SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
> file://0001-Disable-running-gyp-files-for-bundled-deps.patch \
> -"
> -SRC_URI[md5sum] = "bfc5da493c72ded3a7f43b5662bfc53c"
> -SRC_URI[sha256sum] = "968523333947cc3f769d73dedc6c9c60580826d8714bc0e62ca4589de6a7c633"
> + file://0003-Crypto-reduce-memory-usage-of-SignFinal.patch \
> + file://0004-Make-compatibility-with-gcc-4.8.patch \
> + file://0005-Link-atomic-library.patch \
> + "
> +SRC_URI_append_class-target = " \
> + file://0002-Using-native-torque.patch \
> + "
> +
> +SRC_URI[md5sum] = "1cad7963255de53509bfa560221bdc88"
> +SRC_URI[sha256sum] = "1a55f7b9fb80442182d9e1eba4fca4dac3c781cdcb25d6be37b24d253f61c858"
>
> S = "${WORKDIR}/node-v${PV}"
>
> @@ -74,6 +82,10 @@ do_install_append_class-native() {
> # use sed on npm-cli.js because otherwise symlink is replaced with normal file and
> # npm-cli.js continues to use old shebang
> sed "1s^.*^#\!/usr/bin/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js
> +
> + # Install the native torque to provide it within sysroot for the target compilation
> + install -d ${D}${bindir}
> + install -m 0755 ${S}/out/Release/torque ${D}${bindir}/torque
> }
>
> do_install_append_class-target() {
> --
> 2.11.0
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 14+ messages in thread
* [meta-oe][PATCH v5] nodejs 8.15.0 -> 10.15.1
2019-02-14 14:53 ` [meta-oe][PATCH] " Andrej Valek
` (3 preceding siblings ...)
2019-02-17 11:03 ` [meta-oe][PATCH v4] " Andrej Valek
@ 2019-02-21 15:29 ` Andrej Valek
2019-02-21 16:45 ` Khem Raj
4 siblings, 1 reply; 14+ messages in thread
From: Andrej Valek @ 2019-02-21 15:29 UTC (permalink / raw)
To: openembedded-devel
Update nodejs to active 10.x LTS release 10.15.1.
- link atomic library
- make it compatible with gcc < 4.9
Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
---
...isable-running-gyp-files-for-bundled-deps.patch | 23 ++--
.../nodejs/nodejs/0002-Using-native-torque.patch | 36 ++++++
...3-Crypto-reduce-memory-usage-of-SignFinal.patch | 122 +++++++++++++++++++++
.../0004-Make-compatibility-with-gcc-4.8.patch | 46 ++++++++
.../nodejs/nodejs/0005-Link-atomic-library.patch | 20 ++++
.../nodejs/{nodejs_8.15.0.bb => nodejs_10.15.1.bb} | 20 +++-
6 files changed, 250 insertions(+), 17 deletions(-)
create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch
create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0003-Crypto-reduce-memory-usage-of-SignFinal.patch
create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0004-Make-compatibility-with-gcc-4.8.patch
create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0005-Link-atomic-library.patch
rename meta-oe/recipes-devtools/nodejs/{nodejs_8.15.0.bb => nodejs_10.15.1.bb} (83%)
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
index 324a4683d..5d0dc03b6 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
@@ -4,26 +4,23 @@ 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(-)
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
-index 0a217bd893..e1229ad07f 100644
+index a98772f..f5663e2 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
+@@ -123,8 +123,8 @@ with-code-cache:
+ test-code-cache: with-code-cache
+ $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) code-cache
-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
++ deps/v8/gypfiles/toolchain.gypi \
+ deps/v8/gypfiles/features.gypi deps/v8/gypfiles/v8.gyp node.gyp \
+ config.gypi
$(PYTHON) tools/gyp_node.py -f make
-
- config.gypi: configure
--
-2.12.2
+2.19.2
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch
new file mode 100644
index 000000000..e9035f9eb
--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch
@@ -0,0 +1,36 @@
+From 4bbee5e3d58bc4911999f3ec2cc5aab8ded6717b Mon Sep 17 00:00:00 2001
+From: "Winker Matthias (TT-CA/ENG1)" <Matthias.Winker@de.bosch.com>
+Date: Tue, 11 Dec 2018 10:44:29 +0100
+Subject: [PATCH] Using native torque
+
+---
+ deps/v8/gypfiles/v8.gyp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/deps/v8/gypfiles/v8.gyp b/deps/v8/gypfiles/v8.gyp
+index 8c78f02255..434168844e 100644
+--- a/deps/v8/gypfiles/v8.gyp
++++ b/deps/v8/gypfiles/v8.gyp
+@@ -2831,7 +2831,6 @@
+ {
+ 'action_name': 'run_torque',
+ 'inputs': [ # Order matters.
+- '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)torque<(EXECUTABLE_SUFFIX)',
+ '../src/builtins/base.tq',
+ '../src/builtins/array.tq',
+ '../src/builtins/typed-array.tq',
+@@ -2845,7 +2844,10 @@
+ '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-from-dsl-gen.cc',
+ '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-from-dsl-gen.h',
+ ],
+- 'action': ['<@(_inputs)', '-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated'],
++ 'action': [
++ 'torque',
++ '<@(_inputs)',
++ '-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated'],
+ },
+ ],
+ }, # torque
+--
+2.19.2
+
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0003-Crypto-reduce-memory-usage-of-SignFinal.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0003-Crypto-reduce-memory-usage-of-SignFinal.patch
new file mode 100644
index 000000000..ed3bac39b
--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0003-Crypto-reduce-memory-usage-of-SignFinal.patch
@@ -0,0 +1,122 @@
+From 20282b1cb0389553421c4c5b14de198c5dfff50b Mon Sep 17 00:00:00 2001
+From: Anna Henningsen <anna@addaleax.net>
+Date: Sat, 20 Oct 2018 05:24:54 +0200
+Subject: [PATCH] src: use more explicit return type in Sign::SignFinal()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Using the non-indexed variant of `std::get<>` broke Travis CI.
+Also, this allows us to be a bit more concise when returning
+from `SignFinal()` due to some error condition.
+
+Refs: https://github.com/nodejs/node/pull/23427
+
+PR-URL: https://github.com/nodejs/node/pull/23779
+Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
+Reviewed-By: Tobias Nießen <tniessen@tnie.de>
+Reviewed-By: Refael Ackermann <refack@gmail.com>
+Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
+---
+ src/node_crypto.cc | 23 +++++++++++------------
+ src/node_crypto.h | 12 +++++++++++-
+ 2 files changed, 22 insertions(+), 13 deletions(-)
+
+diff --git a/src/node_crypto.cc b/src/node_crypto.cc
+index bd8d9e032554..ec7d4f2bb5be 100644
+--- a/src/node_crypto.cc
++++ b/src/node_crypto.cc
+@@ -3562,22 +3562,20 @@ static MallocedBuffer<unsigned char> Node_SignFinal(EVPMDPointer&& mdctx,
+ return MallocedBuffer<unsigned char>();
+ }
+
+-std::pair<SignBase::Error, MallocedBuffer<unsigned char>> Sign::SignFinal(
++Sign::SignResult Sign::SignFinal(
+ const char* key_pem,
+ int key_pem_len,
+ const char* passphrase,
+ int padding,
+ int salt_len) {
+- MallocedBuffer<unsigned char> buffer;
+-
+ if (!mdctx_)
+- return std::make_pair(kSignNotInitialised, std::move(buffer));
++ return SignResult(kSignNotInitialised);
+
+ EVPMDPointer mdctx = std::move(mdctx_);
+
+ BIOPointer bp(BIO_new_mem_buf(const_cast<char*>(key_pem), key_pem_len));
+ if (!bp)
+- return std::make_pair(kSignPrivateKey, std::move(buffer));
++ return SignResult(kSignPrivateKey);
+
+ EVPKeyPointer pkey(PEM_read_bio_PrivateKey(bp.get(),
+ nullptr,
+@@ -3588,7 +3586,7 @@ std::pair<SignBase::Error, MallocedBuffer<unsigned char>> Sign::SignFinal(
+ // without `pkey` being set to nullptr;
+ // cf. the test of `test_bad_rsa_privkey.pem` for an example.
+ if (!pkey || 0 != ERR_peek_error())
+- return std::make_pair(kSignPrivateKey, std::move(buffer));
++ return SignResult(kSignPrivateKey);
+
+ #ifdef NODE_FIPS_MODE
+ /* Validate DSA2 parameters from FIPS 186-4 */
+@@ -3612,9 +3610,10 @@ std::pair<SignBase::Error, MallocedBuffer<unsigned char>> Sign::SignFinal(
+ }
+ #endif // NODE_FIPS_MODE
+
+- buffer = Node_SignFinal(std::move(mdctx), pkey, padding, salt_len);
++ MallocedBuffer<unsigned char> buffer =
++ Node_SignFinal(std::move(mdctx), pkey, padding, salt_len);
+ Error error = buffer.is_empty() ? kSignPrivateKey : kSignOk;
+- return std::make_pair(error, std::move(buffer));
++ return SignResult(error, std::move(buffer));
+ }
+
+
+@@ -3639,18 +3638,18 @@ void Sign::SignFinal(const FunctionCallbackInfo<Value>& args) {
+
+ ClearErrorOnReturn clear_error_on_return;
+
+- std::pair<Error, MallocedBuffer<unsigned char>> ret = sign->SignFinal(
++ SignResult ret = sign->SignFinal(
+ buf,
+ buf_len,
+ len >= 2 && !args[1]->IsNull() ? *passphrase : nullptr,
+ padding,
+ salt_len);
+
+- if (std::get<Error>(ret) != kSignOk)
+- return sign->CheckThrow(std::get<Error>(ret));
++ if (ret.error != kSignOk)
++ return sign->CheckThrow(ret.error);
+
+ MallocedBuffer<unsigned char> sig =
+- std::move(std::get<MallocedBuffer<unsigned char>>(ret));
++ std::move(ret.signature);
+
+ Local<Object> rc =
+ Buffer::New(env, reinterpret_cast<char*>(sig.release()), sig.size)
+diff --git a/src/node_crypto.h b/src/node_crypto.h
+index 6fcf737f6c43..0c26c1f6ff1d 100644
+--- a/src/node_crypto.h
++++ b/src/node_crypto.h
+@@ -518,7 +518,17 @@ class Sign : public SignBase {
+ public:
+ static void Initialize(Environment* env, v8::Local<v8::Object> target);
+
+- std::pair<Error, MallocedBuffer<unsigned char>> SignFinal(
++ struct SignResult {
++ Error error;
++ MallocedBuffer<unsigned char> signature;
++
++ explicit SignResult(
++ Error err,
++ MallocedBuffer<unsigned char>&& sig = MallocedBuffer<unsigned char>())
++ : error(err), signature(std::move(sig)) {}
++ };
++
++ SignResult SignFinal(
+ const char* key_pem,
+ int key_pem_len,
+ const char* passphrase,
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0004-Make-compatibility-with-gcc-4.8.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0004-Make-compatibility-with-gcc-4.8.patch
new file mode 100644
index 000000000..cb38362e4
--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0004-Make-compatibility-with-gcc-4.8.patch
@@ -0,0 +1,46 @@
+Implement function as wrapper for std::make_unique
+method to be compatible with gcc < 4.9 .
+"error::make_unique is not a member of 'std'"
+
+Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
+
+diff -Naur node-v10.15.1/src/cares_wrap.cc node-v10.15.1/src/cares_wrap.cc
+--- node-v10.15.1/src/cares_wrap.cc 2019-01-29 08:20:50.000000000 +0100
++++ node-v10.15.1/src/cares_wrap.cc 2019-02-21 16:22:25.489131665 +0100
+@@ -52,6 +52,16 @@
+ # define AI_V4MAPPED 0
+ #endif
+
++#ifndef __cpp_lib_make_unique
++namespace std {
++ /// make_unique implementation
++ template<typename T, typename... Args>
++ std::unique_ptr<T> make_unique(Args&&... args) {
++ return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
++ }
++}
++#endif
++
+ namespace node {
+ namespace cares_wrap {
+
+diff -Naur node-v10.15.1/src/inspector_agent.cc node-v10.15.1/src/inspector_agent.cc
+--- node-v10.15.1/src/inspector_agent.cc 2019-01-29 08:20:50.000000000 +0100
++++ node-v10.15.1/src/inspector_agent.cc 2019-02-21 16:22:09.000185992 +0100
+@@ -24,6 +24,16 @@
+ #include <pthread.h>
+ #endif // __POSIX__
+
++#ifndef __cpp_lib_make_unique
++namespace std {
++ /// make_unique implementation
++ template<typename T, typename... Args>
++ std::unique_ptr<T> make_unique(Args&&... args) {
++ return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
++ }
++}
++#endif
++
+ namespace node {
+ namespace inspector {
+ namespace {
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0005-Link-atomic-library.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0005-Link-atomic-library.patch
new file mode 100644
index 000000000..66ff18b4a
--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/0005-Link-atomic-library.patch
@@ -0,0 +1,20 @@
+Link atomic library to fix missing undefined referrences
+like "undefined reference to `__atomic_fetch_add_8'"
+
+Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
+
+diff -Naur node-v10.15.1/deps/v8/gypfiles/v8.gyp node-v10.15.1/deps/v8/gypfiles/v8.gyp
+--- node-v10.15.1/deps/v8/gypfiles/v8.gyp 2019-02-13 09:02:21.000000000 +0100
++++ node-v10.15.1/deps/v8/gypfiles/v8.gyp 2019-02-15 21:27:11.755679660 +0100
+@@ -452,6 +452,11 @@
+ '<(DEPTH)',
+ '<(SHARED_INTERMEDIATE_DIR)'
+ ],
++ 'link_settings': {
++ 'libraries': [
++ '-latomic'
++ ],
++ },
+ 'sources': [
+ '<@(inspector_all_sources)',
+ '../include//v8-inspector-protocol.h',
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_8.15.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
similarity index 83%
rename from meta-oe/recipes-devtools/nodejs/nodejs_8.15.0.bb
rename to meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
index 44eaee974..17c9bb0c4 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_8.15.0.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
@@ -1,9 +1,10 @@
DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript"
HOMEPAGE = "http://nodejs.org"
LICENSE = "MIT & BSD & Artistic-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=fde91d5c5bbd1e0389623e1ac018d9e8"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=9ceeba79eb2ea1067b7b3ed16fff8bab"
DEPENDS = "openssl zlib icu"
+DEPENDS_append_class-target = " nodejs-native"
inherit pkgconfig
@@ -13,9 +14,16 @@ COMPATIBLE_MACHINE_mips64 = "(!.*mips64).*"
SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
file://0001-Disable-running-gyp-files-for-bundled-deps.patch \
-"
-SRC_URI[md5sum] = "bfc5da493c72ded3a7f43b5662bfc53c"
-SRC_URI[sha256sum] = "968523333947cc3f769d73dedc6c9c60580826d8714bc0e62ca4589de6a7c633"
+ file://0003-Crypto-reduce-memory-usage-of-SignFinal.patch \
+ file://0004-Make-compatibility-with-gcc-4.8.patch \
+ file://0005-Link-atomic-library.patch \
+ "
+SRC_URI_append_class-target = " \
+ file://0002-Using-native-torque.patch \
+ "
+
+SRC_URI[md5sum] = "1cad7963255de53509bfa560221bdc88"
+SRC_URI[sha256sum] = "1a55f7b9fb80442182d9e1eba4fca4dac3c781cdcb25d6be37b24d253f61c858"
S = "${WORKDIR}/node-v${PV}"
@@ -74,6 +82,10 @@ do_install_append_class-native() {
# use sed on npm-cli.js because otherwise symlink is replaced with normal file and
# npm-cli.js continues to use old shebang
sed "1s^.*^#\!/usr/bin/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js
+
+ # Install the native torque to provide it within sysroot for the target compilation
+ install -d ${D}${bindir}
+ install -m 0755 ${S}/out/Release/torque ${D}${bindir}/torque
}
do_install_append_class-target() {
--
2.11.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [meta-oe][PATCH v5] nodejs 8.15.0 -> 10.15.1
2019-02-21 15:29 ` [meta-oe][PATCH v5] " Andrej Valek
@ 2019-02-21 16:45 ` Khem Raj
0 siblings, 0 replies; 14+ messages in thread
From: Khem Raj @ 2019-02-21 16:45 UTC (permalink / raw)
To: Andrej Valek; +Cc: openembeded-devel
On Thu, Feb 21, 2019 at 7:29 AM Andrej Valek <andrej.valek@siemens.com> wrote:
>
> Update nodejs to active 10.x LTS release 10.15.1.
> - link atomic library
> - make it compatible with gcc < 4.9
>
I have merged v4 already so can you send the delta on top of current
master please
> Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
> ---
> ...isable-running-gyp-files-for-bundled-deps.patch | 23 ++--
> .../nodejs/nodejs/0002-Using-native-torque.patch | 36 ++++++
> ...3-Crypto-reduce-memory-usage-of-SignFinal.patch | 122 +++++++++++++++++++++
> .../0004-Make-compatibility-with-gcc-4.8.patch | 46 ++++++++
> .../nodejs/nodejs/0005-Link-atomic-library.patch | 20 ++++
> .../nodejs/{nodejs_8.15.0.bb => nodejs_10.15.1.bb} | 20 +++-
> 6 files changed, 250 insertions(+), 17 deletions(-)
> create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch
> create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0003-Crypto-reduce-memory-usage-of-SignFinal.patch
> create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0004-Make-compatibility-with-gcc-4.8.patch
> create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0005-Link-atomic-library.patch
> rename meta-oe/recipes-devtools/nodejs/{nodejs_8.15.0.bb => nodejs_10.15.1.bb} (83%)
>
> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
> index 324a4683d..5d0dc03b6 100644
> --- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
> +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
> @@ -4,26 +4,23 @@ 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(-)
> + Makefile | 4 ++--
> + 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Makefile b/Makefile
> -index 0a217bd893..e1229ad07f 100644
> +index a98772f..f5663e2 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
> +@@ -123,8 +123,8 @@ with-code-cache:
> + test-code-cache: with-code-cache
> + $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) code-cache
>
> -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
> ++ deps/v8/gypfiles/toolchain.gypi \
> + deps/v8/gypfiles/features.gypi deps/v8/gypfiles/v8.gyp node.gyp \
> + config.gypi
> $(PYTHON) tools/gyp_node.py -f make
> -
> - config.gypi: configure
> --
> -2.12.2
> +2.19.2
> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch
> new file mode 100644
> index 000000000..e9035f9eb
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch
> @@ -0,0 +1,36 @@
> +From 4bbee5e3d58bc4911999f3ec2cc5aab8ded6717b Mon Sep 17 00:00:00 2001
> +From: "Winker Matthias (TT-CA/ENG1)" <Matthias.Winker@de.bosch.com>
> +Date: Tue, 11 Dec 2018 10:44:29 +0100
> +Subject: [PATCH] Using native torque
> +
> +---
> + deps/v8/gypfiles/v8.gyp | 6 ++++--
> + 1 file changed, 4 insertions(+), 2 deletions(-)
> +
> +diff --git a/deps/v8/gypfiles/v8.gyp b/deps/v8/gypfiles/v8.gyp
> +index 8c78f02255..434168844e 100644
> +--- a/deps/v8/gypfiles/v8.gyp
> ++++ b/deps/v8/gypfiles/v8.gyp
> +@@ -2831,7 +2831,6 @@
> + {
> + 'action_name': 'run_torque',
> + 'inputs': [ # Order matters.
> +- '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)torque<(EXECUTABLE_SUFFIX)',
> + '../src/builtins/base.tq',
> + '../src/builtins/array.tq',
> + '../src/builtins/typed-array.tq',
> +@@ -2845,7 +2844,10 @@
> + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-from-dsl-gen.cc',
> + '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-from-dsl-gen.h',
> + ],
> +- 'action': ['<@(_inputs)', '-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated'],
> ++ 'action': [
> ++ 'torque',
> ++ '<@(_inputs)',
> ++ '-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated'],
> + },
> + ],
> + }, # torque
> +--
> +2.19.2
> +
> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0003-Crypto-reduce-memory-usage-of-SignFinal.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0003-Crypto-reduce-memory-usage-of-SignFinal.patch
> new file mode 100644
> index 000000000..ed3bac39b
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0003-Crypto-reduce-memory-usage-of-SignFinal.patch
> @@ -0,0 +1,122 @@
> +From 20282b1cb0389553421c4c5b14de198c5dfff50b Mon Sep 17 00:00:00 2001
> +From: Anna Henningsen <anna@addaleax.net>
> +Date: Sat, 20 Oct 2018 05:24:54 +0200
> +Subject: [PATCH] src: use more explicit return type in Sign::SignFinal()
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +Using the non-indexed variant of `std::get<>` broke Travis CI.
> +Also, this allows us to be a bit more concise when returning
> +from `SignFinal()` due to some error condition.
> +
> +Refs: https://github.com/nodejs/node/pull/23427
> +
> +PR-URL: https://github.com/nodejs/node/pull/23779
> +Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
> +Reviewed-By: Tobias Nießen <tniessen@tnie.de>
> +Reviewed-By: Refael Ackermann <refack@gmail.com>
> +Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
> +---
> + src/node_crypto.cc | 23 +++++++++++------------
> + src/node_crypto.h | 12 +++++++++++-
> + 2 files changed, 22 insertions(+), 13 deletions(-)
> +
> +diff --git a/src/node_crypto.cc b/src/node_crypto.cc
> +index bd8d9e032554..ec7d4f2bb5be 100644
> +--- a/src/node_crypto.cc
> ++++ b/src/node_crypto.cc
> +@@ -3562,22 +3562,20 @@ static MallocedBuffer<unsigned char> Node_SignFinal(EVPMDPointer&& mdctx,
> + return MallocedBuffer<unsigned char>();
> + }
> +
> +-std::pair<SignBase::Error, MallocedBuffer<unsigned char>> Sign::SignFinal(
> ++Sign::SignResult Sign::SignFinal(
> + const char* key_pem,
> + int key_pem_len,
> + const char* passphrase,
> + int padding,
> + int salt_len) {
> +- MallocedBuffer<unsigned char> buffer;
> +-
> + if (!mdctx_)
> +- return std::make_pair(kSignNotInitialised, std::move(buffer));
> ++ return SignResult(kSignNotInitialised);
> +
> + EVPMDPointer mdctx = std::move(mdctx_);
> +
> + BIOPointer bp(BIO_new_mem_buf(const_cast<char*>(key_pem), key_pem_len));
> + if (!bp)
> +- return std::make_pair(kSignPrivateKey, std::move(buffer));
> ++ return SignResult(kSignPrivateKey);
> +
> + EVPKeyPointer pkey(PEM_read_bio_PrivateKey(bp.get(),
> + nullptr,
> +@@ -3588,7 +3586,7 @@ std::pair<SignBase::Error, MallocedBuffer<unsigned char>> Sign::SignFinal(
> + // without `pkey` being set to nullptr;
> + // cf. the test of `test_bad_rsa_privkey.pem` for an example.
> + if (!pkey || 0 != ERR_peek_error())
> +- return std::make_pair(kSignPrivateKey, std::move(buffer));
> ++ return SignResult(kSignPrivateKey);
> +
> + #ifdef NODE_FIPS_MODE
> + /* Validate DSA2 parameters from FIPS 186-4 */
> +@@ -3612,9 +3610,10 @@ std::pair<SignBase::Error, MallocedBuffer<unsigned char>> Sign::SignFinal(
> + }
> + #endif // NODE_FIPS_MODE
> +
> +- buffer = Node_SignFinal(std::move(mdctx), pkey, padding, salt_len);
> ++ MallocedBuffer<unsigned char> buffer =
> ++ Node_SignFinal(std::move(mdctx), pkey, padding, salt_len);
> + Error error = buffer.is_empty() ? kSignPrivateKey : kSignOk;
> +- return std::make_pair(error, std::move(buffer));
> ++ return SignResult(error, std::move(buffer));
> + }
> +
> +
> +@@ -3639,18 +3638,18 @@ void Sign::SignFinal(const FunctionCallbackInfo<Value>& args) {
> +
> + ClearErrorOnReturn clear_error_on_return;
> +
> +- std::pair<Error, MallocedBuffer<unsigned char>> ret = sign->SignFinal(
> ++ SignResult ret = sign->SignFinal(
> + buf,
> + buf_len,
> + len >= 2 && !args[1]->IsNull() ? *passphrase : nullptr,
> + padding,
> + salt_len);
> +
> +- if (std::get<Error>(ret) != kSignOk)
> +- return sign->CheckThrow(std::get<Error>(ret));
> ++ if (ret.error != kSignOk)
> ++ return sign->CheckThrow(ret.error);
> +
> + MallocedBuffer<unsigned char> sig =
> +- std::move(std::get<MallocedBuffer<unsigned char>>(ret));
> ++ std::move(ret.signature);
> +
> + Local<Object> rc =
> + Buffer::New(env, reinterpret_cast<char*>(sig.release()), sig.size)
> +diff --git a/src/node_crypto.h b/src/node_crypto.h
> +index 6fcf737f6c43..0c26c1f6ff1d 100644
> +--- a/src/node_crypto.h
> ++++ b/src/node_crypto.h
> +@@ -518,7 +518,17 @@ class Sign : public SignBase {
> + public:
> + static void Initialize(Environment* env, v8::Local<v8::Object> target);
> +
> +- std::pair<Error, MallocedBuffer<unsigned char>> SignFinal(
> ++ struct SignResult {
> ++ Error error;
> ++ MallocedBuffer<unsigned char> signature;
> ++
> ++ explicit SignResult(
> ++ Error err,
> ++ MallocedBuffer<unsigned char>&& sig = MallocedBuffer<unsigned char>())
> ++ : error(err), signature(std::move(sig)) {}
> ++ };
> ++
> ++ SignResult SignFinal(
> + const char* key_pem,
> + int key_pem_len,
> + const char* passphrase,
> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0004-Make-compatibility-with-gcc-4.8.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0004-Make-compatibility-with-gcc-4.8.patch
> new file mode 100644
> index 000000000..cb38362e4
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0004-Make-compatibility-with-gcc-4.8.patch
> @@ -0,0 +1,46 @@
> +Implement function as wrapper for std::make_unique
> +method to be compatible with gcc < 4.9 .
> +"error::make_unique is not a member of 'std'"
> +
> +Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
> +
> +diff -Naur node-v10.15.1/src/cares_wrap.cc node-v10.15.1/src/cares_wrap.cc
> +--- node-v10.15.1/src/cares_wrap.cc 2019-01-29 08:20:50.000000000 +0100
> ++++ node-v10.15.1/src/cares_wrap.cc 2019-02-21 16:22:25.489131665 +0100
> +@@ -52,6 +52,16 @@
> + # define AI_V4MAPPED 0
> + #endif
> +
> ++#ifndef __cpp_lib_make_unique
> ++namespace std {
> ++ /// make_unique implementation
> ++ template<typename T, typename... Args>
> ++ std::unique_ptr<T> make_unique(Args&&... args) {
> ++ return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
> ++ }
> ++}
> ++#endif
> ++
> + namespace node {
> + namespace cares_wrap {
> +
> +diff -Naur node-v10.15.1/src/inspector_agent.cc node-v10.15.1/src/inspector_agent.cc
> +--- node-v10.15.1/src/inspector_agent.cc 2019-01-29 08:20:50.000000000 +0100
> ++++ node-v10.15.1/src/inspector_agent.cc 2019-02-21 16:22:09.000185992 +0100
> +@@ -24,6 +24,16 @@
> + #include <pthread.h>
> + #endif // __POSIX__
> +
> ++#ifndef __cpp_lib_make_unique
> ++namespace std {
> ++ /// make_unique implementation
> ++ template<typename T, typename... Args>
> ++ std::unique_ptr<T> make_unique(Args&&... args) {
> ++ return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
> ++ }
> ++}
> ++#endif
> ++
> + namespace node {
> + namespace inspector {
> + namespace {
> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0005-Link-atomic-library.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0005-Link-atomic-library.patch
> new file mode 100644
> index 000000000..66ff18b4a
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0005-Link-atomic-library.patch
> @@ -0,0 +1,20 @@
> +Link atomic library to fix missing undefined referrences
> +like "undefined reference to `__atomic_fetch_add_8'"
> +
> +Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
> +
> +diff -Naur node-v10.15.1/deps/v8/gypfiles/v8.gyp node-v10.15.1/deps/v8/gypfiles/v8.gyp
> +--- node-v10.15.1/deps/v8/gypfiles/v8.gyp 2019-02-13 09:02:21.000000000 +0100
> ++++ node-v10.15.1/deps/v8/gypfiles/v8.gyp 2019-02-15 21:27:11.755679660 +0100
> +@@ -452,6 +452,11 @@
> + '<(DEPTH)',
> + '<(SHARED_INTERMEDIATE_DIR)'
> + ],
> ++ 'link_settings': {
> ++ 'libraries': [
> ++ '-latomic'
> ++ ],
> ++ },
> + 'sources': [
> + '<@(inspector_all_sources)',
> + '../include//v8-inspector-protocol.h',
> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_8.15.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
> similarity index 83%
> rename from meta-oe/recipes-devtools/nodejs/nodejs_8.15.0.bb
> rename to meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
> index 44eaee974..17c9bb0c4 100644
> --- a/meta-oe/recipes-devtools/nodejs/nodejs_8.15.0.bb
> +++ b/meta-oe/recipes-devtools/nodejs/nodejs_10.15.1.bb
> @@ -1,9 +1,10 @@
> DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript"
> HOMEPAGE = "http://nodejs.org"
> LICENSE = "MIT & BSD & Artistic-2.0"
> -LIC_FILES_CHKSUM = "file://LICENSE;md5=fde91d5c5bbd1e0389623e1ac018d9e8"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=9ceeba79eb2ea1067b7b3ed16fff8bab"
>
> DEPENDS = "openssl zlib icu"
> +DEPENDS_append_class-target = " nodejs-native"
>
> inherit pkgconfig
>
> @@ -13,9 +14,16 @@ COMPATIBLE_MACHINE_mips64 = "(!.*mips64).*"
>
> SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
> file://0001-Disable-running-gyp-files-for-bundled-deps.patch \
> -"
> -SRC_URI[md5sum] = "bfc5da493c72ded3a7f43b5662bfc53c"
> -SRC_URI[sha256sum] = "968523333947cc3f769d73dedc6c9c60580826d8714bc0e62ca4589de6a7c633"
> + file://0003-Crypto-reduce-memory-usage-of-SignFinal.patch \
> + file://0004-Make-compatibility-with-gcc-4.8.patch \
> + file://0005-Link-atomic-library.patch \
> + "
> +SRC_URI_append_class-target = " \
> + file://0002-Using-native-torque.patch \
> + "
> +
> +SRC_URI[md5sum] = "1cad7963255de53509bfa560221bdc88"
> +SRC_URI[sha256sum] = "1a55f7b9fb80442182d9e1eba4fca4dac3c781cdcb25d6be37b24d253f61c858"
>
> S = "${WORKDIR}/node-v${PV}"
>
> @@ -74,6 +82,10 @@ do_install_append_class-native() {
> # use sed on npm-cli.js because otherwise symlink is replaced with normal file and
> # npm-cli.js continues to use old shebang
> sed "1s^.*^#\!/usr/bin/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js
> +
> + # Install the native torque to provide it within sysroot for the target compilation
> + install -d ${D}${bindir}
> + install -m 0755 ${S}/out/Release/torque ${D}${bindir}/torque
> }
>
> do_install_append_class-target() {
> --
> 2.11.0
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2019-02-21 16:45 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-14 7:32 [meta-oe] nodejs 8.15.0 -> 10.15.1 Andrej Valek
2019-02-14 14:53 ` [meta-oe][PATCH] " Andrej Valek
2019-02-15 14:40 ` Khem Raj
2019-02-15 20:42 ` [meta-oe][PATCH v2] " Andrej Valek
2019-02-16 6:35 ` Khem Raj
2019-02-16 6:35 ` Khem Raj
2019-02-16 7:54 ` Andrej Valek
2019-02-16 8:34 ` Andrej Valek
2019-02-16 16:40 ` Khem Raj
2019-02-17 9:12 ` [meta-oe][PATCH v3] " Andrej Valek
2019-02-17 11:03 ` [meta-oe][PATCH v4] " Andrej Valek
2019-02-21 15:13 ` Khem Raj
2019-02-21 15:29 ` [meta-oe][PATCH v5] " Andrej Valek
2019-02-21 16:45 ` Khem Raj
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.