[oe] [meta-oe][PATCH v2] nodejs 8.15.0 -> 10.15.1

Khem Raj raj.khem at gmail.com
Sat Feb 16 16:40:25 UTC 2019


On Sat, Feb 16, 2019 at 12:34 AM Andrej Valek <andrej.valek at 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 at gmail.com> wrote:
> >>>
> >>> On Fri, Feb 15, 2019 at 12:43 PM Andrej Valek <andrej.valek at 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 at 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 at 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 at 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 at lists.openembedded.org
> >>>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel


More information about the Openembedded-devel mailing list