diff options
-rw-r--r-- | meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch | 25 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-binaries.patch | 71 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch | 36 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/nodejs/nodejs/0003-Install-both-binaries-and-use-libdir.patch | 17 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/nodejs/nodejs/0004-Make-compatibility-with-gcc-4.8.patch | 69 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/nodejs/nodejs/0004-v8-don-t-override-ARM-CFLAGS.patch (renamed from meta-oe/recipes-devtools/nodejs/nodejs/0007-v8-don-t-override-ARM-CFLAGS.patch) | 16 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/nodejs/nodejs/0005-Link-atomic-library.patch | 20 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/nodejs/nodejs_12.14.0.bb (renamed from meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb) | 18 |
8 files changed, 109 insertions, 163 deletions
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 5d0dc03b66..4dd121f485 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,23 +4,22 @@ Date: Thu, 27 Apr 2017 14:25:42 +0200 | |||
4 | Subject: [PATCH] Disable running gyp on shared deps | 4 | Subject: [PATCH] Disable running gyp on shared deps |
5 | 5 | ||
6 | --- | 6 | --- |
7 | Makefile | 4 ++-- | 7 | Makefile | 2 +- |
8 | 1 file changed, 2 insertions(+), 2 deletions(-) | 8 | 1 file changed, 1 insertion(+), 1 deletion(-) |
9 | 9 | ||
10 | diff --git a/Makefile b/Makefile | 10 | diff --git a/Makefile b/Makefile |
11 | index a98772f..f5663e2 100644 | 11 | index 0947300f24..6c98691984 100644 |
12 | --- a/Makefile | 12 | --- a/Makefile |
13 | +++ b/Makefile | 13 | +++ b/Makefile |
14 | @@ -123,8 +123,8 @@ with-code-cache: | 14 | @@ -141,7 +141,7 @@ test-code-cache: with-code-cache |
15 | test-code-cache: with-code-cache | 15 | echo "'test-code-cache' target is a noop" |
16 | $(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) code-cache | ||
17 | 16 | ||
18 | -out/Makefile: common.gypi deps/uv/uv.gyp deps/http_parser/http_parser.gyp \ | 17 | out/Makefile: config.gypi common.gypi node.gyp \ |
19 | - deps/zlib/zlib.gyp deps/v8/gypfiles/toolchain.gypi \ | 18 | - deps/uv/uv.gyp deps/http_parser/http_parser.gyp deps/zlib/zlib.gyp \ |
20 | +out/Makefile: common.gypi deps/http_parser/http_parser.gyp \ | 19 | + deps/http_parser/http_parser.gyp \ |
21 | + deps/v8/gypfiles/toolchain.gypi \ | 20 | tools/v8_gypfiles/toolchain.gypi tools/v8_gypfiles/features.gypi \ |
22 | deps/v8/gypfiles/features.gypi deps/v8/gypfiles/v8.gyp node.gyp \ | 21 | tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp |
23 | config.gypi | ||
24 | $(PYTHON) tools/gyp_node.py -f make | 22 | $(PYTHON) tools/gyp_node.py -f make |
25 | -- | 23 | -- |
26 | 2.19.2 | 24 | 2.20.1 |
25 | |||
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-binaries.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-binaries.patch new file mode 100644 index 0000000000..b5142dc9c1 --- /dev/null +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-binaries.patch | |||
@@ -0,0 +1,71 @@ | |||
1 | From 6c3ac20477a4bac643088f24df3c042e627fafa9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Guillaume Burel <guillaume.burel@stormshield.eu> | ||
3 | Date: Fri, 3 Jan 2020 11:25:54 +0100 | ||
4 | Subject: [PATCH] Using native binaries | ||
5 | |||
6 | --- | ||
7 | node.gyp | 4 ++-- | ||
8 | tools/v8_gypfiles/v8.gyp | 11 ++++------- | ||
9 | 2 files changed, 6 insertions(+), 9 deletions(-) | ||
10 | |||
11 | diff --git a/node.gyp b/node.gyp | ||
12 | index 8f4dc518..d9389190 100644 | ||
13 | --- a/node.gyp | ||
14 | +++ b/node.gyp | ||
15 | @@ -446,7 +446,7 @@ | ||
16 | '<(SHARED_INTERMEDIATE_DIR)/node_code_cache.cc', | ||
17 | ], | ||
18 | 'action': [ | ||
19 | - '<@(_inputs)', | ||
20 | + 'mkcodecache', | ||
21 | '<@(_outputs)', | ||
22 | ], | ||
23 | }, | ||
24 | @@ -471,7 +471,7 @@ | ||
25 | '<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc', | ||
26 | ], | ||
27 | 'action': [ | ||
28 | - '<@(_inputs)', | ||
29 | + 'node_mksnapshot', | ||
30 | '<@(_outputs)', | ||
31 | ], | ||
32 | }, | ||
33 | diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp | ||
34 | index a506a67d..c91f7dde 100644 | ||
35 | --- a/tools/v8_gypfiles/v8.gyp | ||
36 | +++ b/tools/v8_gypfiles/v8.gyp | ||
37 | @@ -140,7 +140,8 @@ | ||
38 | '<@(torque_outputs)', | ||
39 | ], | ||
40 | 'action': [ | ||
41 | - '<@(_inputs)', | ||
42 | + 'torque', | ||
43 | + '<@(torque_files)', | ||
44 | '-o', '<(torque_output_root)/torque-generated', | ||
45 | '-v8-root', '<(V8_ROOT)' | ||
46 | ], | ||
47 | @@ -247,9 +248,7 @@ | ||
48 | '<(generate_bytecode_builtins_list_output)', | ||
49 | ], | ||
50 | 'action': [ | ||
51 | - 'python', | ||
52 | - '<(V8_ROOT)/tools/run.py', | ||
53 | - '<@(_inputs)', | ||
54 | + 'bytecode_builtins_list_generator', | ||
55 | '<@(_outputs)', | ||
56 | ], | ||
57 | }, | ||
58 | @@ -1396,9 +1395,7 @@ | ||
59 | '<(SHARED_INTERMEDIATE_DIR)/src/regexp/special-case.cc', | ||
60 | ], | ||
61 | 'action': [ | ||
62 | - 'python', | ||
63 | - '<(V8_ROOT)/tools/run.py', | ||
64 | - '<@(_inputs)', | ||
65 | + 'gen-regexp-special-case', | ||
66 | '<@(_outputs)', | ||
67 | ], | ||
68 | }, | ||
69 | -- | ||
70 | 2.20.1 | ||
71 | |||
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 deleted file mode 100644 index e9035f9eb3..0000000000 --- a/meta-oe/recipes-devtools/nodejs/nodejs/0002-Using-native-torque.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | From 4bbee5e3d58bc4911999f3ec2cc5aab8ded6717b Mon Sep 17 00:00:00 2001 | ||
2 | From: "Winker Matthias (TT-CA/ENG1)" <Matthias.Winker@de.bosch.com> | ||
3 | Date: Tue, 11 Dec 2018 10:44:29 +0100 | ||
4 | Subject: [PATCH] Using native torque | ||
5 | |||
6 | --- | ||
7 | deps/v8/gypfiles/v8.gyp | 6 ++++-- | ||
8 | 1 file changed, 4 insertions(+), 2 deletions(-) | ||
9 | |||
10 | diff --git a/deps/v8/gypfiles/v8.gyp b/deps/v8/gypfiles/v8.gyp | ||
11 | index 8c78f02255..434168844e 100644 | ||
12 | --- a/deps/v8/gypfiles/v8.gyp | ||
13 | +++ b/deps/v8/gypfiles/v8.gyp | ||
14 | @@ -2831,7 +2831,6 @@ | ||
15 | { | ||
16 | 'action_name': 'run_torque', | ||
17 | 'inputs': [ # Order matters. | ||
18 | - '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)torque<(EXECUTABLE_SUFFIX)', | ||
19 | '../src/builtins/base.tq', | ||
20 | '../src/builtins/array.tq', | ||
21 | '../src/builtins/typed-array.tq', | ||
22 | @@ -2845,7 +2844,10 @@ | ||
23 | '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-from-dsl-gen.cc', | ||
24 | '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-from-dsl-gen.h', | ||
25 | ], | ||
26 | - 'action': ['<@(_inputs)', '-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated'], | ||
27 | + 'action': [ | ||
28 | + 'torque', | ||
29 | + '<@(_inputs)', | ||
30 | + '-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated'], | ||
31 | }, | ||
32 | ], | ||
33 | }, # torque | ||
34 | -- | ||
35 | 2.19.2 | ||
36 | |||
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0003-Install-both-binaries-and-use-libdir.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0003-Install-both-binaries-and-use-libdir.patch index 7aa70fec99..599f742b2f 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs/0003-Install-both-binaries-and-use-libdir.patch +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0003-Install-both-binaries-and-use-libdir.patch | |||
@@ -15,17 +15,16 @@ Stolen from [1] | |||
15 | Upstream-Status: Pending | 15 | Upstream-Status: Pending |
16 | 16 | ||
17 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | 17 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> |
18 | |||
19 | --- | 18 | --- |
20 | configure.py | 7 +++++++ | 19 | configure.py | 7 +++++++ |
21 | tools/install.py | 31 ++++++++++++++----------------- | 20 | tools/install.py | 31 ++++++++++++++----------------- |
22 | 2 files changed, 21 insertions(+), 17 deletions(-) | 21 | 2 files changed, 21 insertions(+), 17 deletions(-) |
23 | 22 | ||
24 | diff --git a/configure.py b/configure.py | 23 | diff --git a/configure.py b/configure.py |
25 | index cfd4207..eb26f7d 100755 | 24 | index 20cce214db..e2d78a2a51 100755 |
26 | --- a/configure.py | 25 | --- a/configure.py |
27 | +++ b/configure.py | 26 | +++ b/configure.py |
28 | @@ -552,6 +552,12 @@ parser.add_option('--shared', | 27 | @@ -559,6 +559,12 @@ parser.add_option('--shared', |
29 | help='compile shared library for embedding node in another project. ' + | 28 | help='compile shared library for embedding node in another project. ' + |
30 | '(This mode is not officially supported for regular applications)') | 29 | '(This mode is not officially supported for regular applications)') |
31 | 30 | ||
@@ -38,19 +37,19 @@ index cfd4207..eb26f7d 100755 | |||
38 | parser.add_option('--without-v8-platform', | 37 | parser.add_option('--without-v8-platform', |
39 | action='store_true', | 38 | action='store_true', |
40 | dest='without_v8_platform', | 39 | dest='without_v8_platform', |
41 | @@ -1095,6 +1101,7 @@ def configure_node(o): | 40 | @@ -1103,6 +1109,7 @@ def configure_node(o): |
42 | if options.code_cache_path: | 41 | if o['variables']['want_separate_host_toolset'] == 0: |
43 | o['variables']['node_code_cache_path'] = options.code_cache_path | 42 | o['variables']['node_code_cache'] = 'yes' # For testing |
44 | o['variables']['node_shared'] = b(options.shared) | 43 | o['variables']['node_shared'] = b(options.shared) |
45 | + o['variables']['libdir'] = options.libdir | 44 | + o['variables']['libdir'] = options.libdir |
46 | node_module_version = getmoduleversion.get_version() | 45 | node_module_version = getmoduleversion.get_version() |
47 | 46 | ||
48 | if sys.platform == 'darwin': | 47 | if sys.platform == 'darwin': |
49 | diff --git a/tools/install.py b/tools/install.py | 48 | diff --git a/tools/install.py b/tools/install.py |
50 | index 028c32e..bf443c4 100755 | 49 | index 655802980a..fe4723bf15 100755 |
51 | --- a/tools/install.py | 50 | --- a/tools/install.py |
52 | +++ b/tools/install.py | 51 | +++ b/tools/install.py |
53 | @@ -117,26 +117,23 @@ def subdir_files(path, dest, action): | 52 | @@ -121,26 +121,23 @@ def subdir_files(path, dest, action): |
54 | 53 | ||
55 | def files(action): | 54 | def files(action): |
56 | is_windows = sys.platform == 'win32' | 55 | is_windows = sys.platform == 'win32' |
@@ -92,5 +91,5 @@ index 028c32e..bf443c4 100755 | |||
92 | if 'true' == variables.get('node_use_dtrace'): | 91 | if 'true' == variables.get('node_use_dtrace'): |
93 | action(['out/Release/node.d'], 'lib/dtrace/node.d') | 92 | action(['out/Release/node.d'], 'lib/dtrace/node.d') |
94 | -- | 93 | -- |
95 | 2.23.0 | 94 | 2.20.1 |
96 | 95 | ||
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 deleted file mode 100644 index 925c085e9b..0000000000 --- a/meta-oe/recipes-devtools/nodejs/nodejs/0004-Make-compatibility-with-gcc-4.8.patch +++ /dev/null | |||
@@ -1,69 +0,0 @@ | |||
1 | Implement function as wrapper for std::make_unique | ||
2 | method to be compatible with gcc < 4.9 . | ||
3 | "error::make_unique is not a member of 'std'" | ||
4 | |||
5 | Signed-off-by: Andrej Valek <andrej.valek@siemens.com> | ||
6 | Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com> | ||
7 | |||
8 | diff -Naur node-v10.15.1/src/cares_wrap.cc node-v10.15.1/src/cares_wrap.cc | ||
9 | --- node-v10.15.1/src/cares_wrap.cc 2019-01-29 08:20:50.000000000 +0100 | ||
10 | +++ node-v10.15.1/src/cares_wrap.cc 2019-02-21 16:22:25.489131665 +0100 | ||
11 | @@ -52,6 +52,16 @@ | ||
12 | # define AI_V4MAPPED 0 | ||
13 | #endif | ||
14 | |||
15 | +#ifndef __cpp_lib_make_unique | ||
16 | +namespace std { | ||
17 | + /// make_unique implementation | ||
18 | + template<typename T, typename... Args> | ||
19 | + std::unique_ptr<T> make_unique(Args&&... args) { | ||
20 | + return std::unique_ptr<T>(new T(std::forward<Args>(args)...)); | ||
21 | + } | ||
22 | +} | ||
23 | +#endif | ||
24 | + | ||
25 | namespace node { | ||
26 | namespace cares_wrap { | ||
27 | |||
28 | diff -Naur node-v10.15.1/src/inspector_agent.cc node-v10.15.1/src/inspector_agent.cc | ||
29 | --- node-v10.15.1/src/inspector_agent.cc 2019-01-29 08:20:50.000000000 +0100 | ||
30 | +++ node-v10.15.1/src/inspector_agent.cc 2019-02-21 16:22:09.000185992 +0100 | ||
31 | @@ -24,6 +24,16 @@ | ||
32 | #include <pthread.h> | ||
33 | #endif // __POSIX__ | ||
34 | |||
35 | +#ifndef __cpp_lib_make_unique | ||
36 | +namespace std { | ||
37 | + /// make_unique implementation | ||
38 | + template<typename T, typename... Args> | ||
39 | + std::unique_ptr<T> make_unique(Args&&... args) { | ||
40 | + return std::unique_ptr<T>(new T(std::forward<Args>(args)...)); | ||
41 | + } | ||
42 | +} | ||
43 | +#endif | ||
44 | + | ||
45 | namespace node { | ||
46 | namespace inspector { | ||
47 | namespace { | ||
48 | |||
49 | diff --git a/src/inspector/main_thread_interface.cc b/src/inspector/main_thread_interface.cc | ||
50 | index e374c0fd70..05d7d8c60f 100644 | ||
51 | --- a/src/inspector/main_thread_interface.cc | ||
52 | +++ b/src/inspector/main_thread_interface.cc | ||
53 | @@ -6,6 +6,16 @@ | ||
54 | #include <functional> | ||
55 | #include <unicode/unistr.h> | ||
56 | |||
57 | +#ifndef __cpp_lib_make_unique | ||
58 | +namespace std { | ||
59 | + /// make_unique implementation | ||
60 | + template<typename T, typename... Args> | ||
61 | + std::unique_ptr<T> make_unique(Args&&... args) { | ||
62 | + return std::unique_ptr<T>(new T(std::forward<Args>(args)...)); | ||
63 | + } | ||
64 | +} | ||
65 | +#endif | ||
66 | + | ||
67 | namespace node { | ||
68 | namespace inspector { | ||
69 | namespace { | ||
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0007-v8-don-t-override-ARM-CFLAGS.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0004-v8-don-t-override-ARM-CFLAGS.patch index eb2cbfb8b1..97ed972cee 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs/0007-v8-don-t-override-ARM-CFLAGS.patch +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0004-v8-don-t-override-ARM-CFLAGS.patch | |||
@@ -24,14 +24,14 @@ problems have been noted during compilation or runtime. | |||
24 | Upstream-Status: Inappropriate [oe-specific] | 24 | Upstream-Status: Inappropriate [oe-specific] |
25 | Signed-off-by: André Draszik <git@andred.net> | 25 | Signed-off-by: André Draszik <git@andred.net> |
26 | --- | 26 | --- |
27 | deps/v8/gypfiles/toolchain.gypi | 52 ++------------------------------- | 27 | tools/v8_gypfiles/toolchain.gypi | 52 ++------------------------------ |
28 | 1 file changed, 2 insertions(+), 50 deletions(-) | 28 | 1 file changed, 2 insertions(+), 50 deletions(-) |
29 | 29 | ||
30 | diff --git a/deps/v8/gypfiles/toolchain.gypi b/deps/v8/gypfiles/toolchain.gypi | 30 | diff --git a/tools/v8_gypfiles/toolchain.gypi b/tools/v8_gypfiles/toolchain.gypi |
31 | index 910a212..1390b15 100644 | 31 | index 264b3e478e..0b41848145 100644 |
32 | --- a/deps/v8/gypfiles/toolchain.gypi | 32 | --- a/tools/v8_gypfiles/toolchain.gypi |
33 | +++ b/deps/v8/gypfiles/toolchain.gypi | 33 | +++ b/tools/v8_gypfiles/toolchain.gypi |
34 | @@ -199,31 +199,7 @@ | 34 | @@ -211,31 +211,7 @@ |
35 | 'target_conditions': [ | 35 | 'target_conditions': [ |
36 | ['_toolset=="host"', { | 36 | ['_toolset=="host"', { |
37 | 'conditions': [ | 37 | 'conditions': [ |
@@ -64,7 +64,7 @@ index 910a212..1390b15 100644 | |||
64 | # Host not built with an Arm CXX compiler (simulator build). | 64 | # Host not built with an Arm CXX compiler (simulator build). |
65 | 'conditions': [ | 65 | 'conditions': [ |
66 | [ 'arm_float_abi=="hard"', { | 66 | [ 'arm_float_abi=="hard"', { |
67 | @@ -242,31 +218,7 @@ | 67 | @@ -254,31 +230,7 @@ |
68 | }], # _toolset=="host" | 68 | }], # _toolset=="host" |
69 | ['_toolset=="target"', { | 69 | ['_toolset=="target"', { |
70 | 'conditions': [ | 70 | 'conditions': [ |
@@ -98,5 +98,5 @@ index 910a212..1390b15 100644 | |||
98 | 'conditions': [ | 98 | 'conditions': [ |
99 | [ 'arm_float_abi=="hard"', { | 99 | [ 'arm_float_abi=="hard"', { |
100 | -- | 100 | -- |
101 | 2.23.0.rc1 | 101 | 2.20.1 |
102 | 102 | ||
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 deleted file mode 100644 index 66ff18b4a3..0000000000 --- a/meta-oe/recipes-devtools/nodejs/nodejs/0005-Link-atomic-library.patch +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | Link atomic library to fix missing undefined referrences | ||
2 | like "undefined reference to `__atomic_fetch_add_8'" | ||
3 | |||
4 | Signed-off-by: Andrej Valek <andrej.valek@siemens.com> | ||
5 | |||
6 | diff -Naur node-v10.15.1/deps/v8/gypfiles/v8.gyp node-v10.15.1/deps/v8/gypfiles/v8.gyp | ||
7 | --- node-v10.15.1/deps/v8/gypfiles/v8.gyp 2019-02-13 09:02:21.000000000 +0100 | ||
8 | +++ node-v10.15.1/deps/v8/gypfiles/v8.gyp 2019-02-15 21:27:11.755679660 +0100 | ||
9 | @@ -452,6 +452,11 @@ | ||
10 | '<(DEPTH)', | ||
11 | '<(SHARED_INTERMEDIATE_DIR)' | ||
12 | ], | ||
13 | + 'link_settings': { | ||
14 | + 'libraries': [ | ||
15 | + '-latomic' | ||
16 | + ], | ||
17 | + }, | ||
18 | 'sources': [ | ||
19 | '<@(inspector_all_sources)', | ||
20 | '../include//v8-inspector-protocol.h', | ||
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.0.bb index ba1c2beed3..35abb8f1f0 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.0.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript" | 1 | DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript" |
2 | HOMEPAGE = "http://nodejs.org" | 2 | HOMEPAGE = "http://nodejs.org" |
3 | LICENSE = "MIT & BSD & Artistic-2.0" | 3 | LICENSE = "MIT & BSD & Artistic-2.0" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=be980eb7ccafe287cb438076a65e888c" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=be4d5107c64dc3d7c57e3797e1a0674b" |
5 | 5 | ||
6 | DEPENDS = "openssl" | 6 | DEPENDS = "openssl" |
7 | DEPENDS_append_class-target = " nodejs-native" | 7 | DEPENDS_append_class-target = " nodejs-native" |
@@ -18,16 +18,14 @@ COMPATIBLE_HOST_riscv32 = "null" | |||
18 | SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ | 18 | SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ |
19 | file://0001-Disable-running-gyp-files-for-bundled-deps.patch \ | 19 | file://0001-Disable-running-gyp-files-for-bundled-deps.patch \ |
20 | file://0003-Install-both-binaries-and-use-libdir.patch \ | 20 | file://0003-Install-both-binaries-and-use-libdir.patch \ |
21 | file://0004-Make-compatibility-with-gcc-4.8.patch \ | 21 | file://0004-v8-don-t-override-ARM-CFLAGS.patch \ |
22 | file://0007-v8-don-t-override-ARM-CFLAGS.patch \ | ||
23 | " | 22 | " |
24 | SRC_URI_append_class-target = " \ | 23 | SRC_URI_append_class-target = " \ |
25 | file://0002-Using-native-torque.patch \ | 24 | file://0002-Using-native-binaries.patch \ |
26 | file://0005-Link-atomic-library.patch \ | ||
27 | " | 25 | " |
28 | 26 | ||
29 | SRC_URI[md5sum] = "d5a56d0abf764a91f627f0690cd4b9f3" | 27 | SRC_URI[md5sum] = "6762f5629f6f68fb9bdf83a741cba038" |
30 | SRC_URI[sha256sum] = "412667d76bd5273c07cb69c215998109fd5bb35c874654f93e6a0132d666c58e" | 28 | SRC_URI[sha256sum] = "088a217ba2af641b8cc15be29f6e2956b8a33e6badb85596bbc2cdea9df9be71" |
31 | 29 | ||
32 | S = "${WORKDIR}/node-v${PV}" | 30 | S = "${WORKDIR}/node-v${PV}" |
33 | 31 | ||
@@ -129,9 +127,13 @@ do_install_append_class-native() { | |||
129 | # npm-cli.js continues to use old shebang | 127 | # npm-cli.js continues to use old shebang |
130 | sed "1s^.*^#\!/usr/bin/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js | 128 | sed "1s^.*^#\!/usr/bin/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js |
131 | 129 | ||
132 | # Install the native torque to provide it within sysroot for the target compilation | 130 | # Install the native binaries to provide it within sysroot for the target compilation |
133 | install -d ${D}${bindir} | 131 | install -d ${D}${bindir} |
134 | install -m 0755 ${S}/out/Release/torque ${D}${bindir}/torque | 132 | install -m 0755 ${S}/out/Release/torque ${D}${bindir}/torque |
133 | install -m 0755 ${S}/out/Release/bytecode_builtins_list_generator ${D}${bindir}/bytecode_builtins_list_generator | ||
134 | install -m 0755 ${S}/out/Release/gen-regexp-special-case ${D}${bindir}/gen-regexp-special-case | ||
135 | install -m 0755 ${S}/out/Release/mkcodecache ${D}${bindir}/mkcodecache | ||
136 | install -m 0755 ${S}/out/Release/node_mksnapshot ${D}${bindir}/node_mksnapshot | ||
135 | } | 137 | } |
136 | 138 | ||
137 | do_install_append_class-target() { | 139 | do_install_append_class-target() { |