diff options
author | Khem Raj <raj.khem@gmail.com> | 2021-06-15 20:32:34 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-06-18 08:33:07 -0700 |
commit | 94e54c209de4788a85ea3c5b7e66dada5dc9f7af (patch) | |
tree | 39e111bcc46d48d9202f9569e8f2dd0fbc25b67f /meta-oe/recipes-devtools | |
parent | b65f2904191b8d309b3971d4e65c5e1701156b1c (diff) | |
download | meta-openembedded-94e54c209de4788a85ea3c5b7e66dada5dc9f7af.tar.gz |
nodejs: Update to 14.17.1
Drop upstreamed v8-call-new-ListFormatter-createInstance.patch patch
Add a patch for ppc64/clang to drop -mminimal-toc since clang does not
have this option
License-Update: URLs updated [1] and copyright owners too [2]
[1] https://github.com/nodejs/node/commit/2d7e0b6912bd04b44ed652bc0f40bb343652d926#diff-c693279643b8cd5d248172d9c22cb7cf4ed163a3c98c8a3f69c2717edd3eacb7
[2] https://github.com/nodejs/node/commit/b57785d89bc548c4048118606919d66dff1c7eb7#diff-c693279643b8cd5d248172d9c22cb7cf4ed163a3c98c8a3f69c2717edd3eacb7
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools')
-rw-r--r-- | meta-oe/recipes-devtools/nodejs/nodejs/0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch | 28 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/nodejs/nodejs/v8-call-new-ListFormatter-createInstance.patch | 93 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/nodejs/nodejs_14.17.1.bb (renamed from meta-oe/recipes-devtools/nodejs/nodejs_14.16.1.bb) | 8 |
3 files changed, 33 insertions, 96 deletions
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch new file mode 100644 index 000000000..00b2e9baa --- /dev/null +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From 0976af0f3b328436ea44a74a406f311adb2ab211 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 15 Jun 2021 19:01:31 -0700 | ||
4 | Subject: [PATCH] ppc64: Do not use -mminimal-toc with clang | ||
5 | |||
6 | clang does not support this option | ||
7 | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | --- | ||
10 | common.gypi | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/common.gypi b/common.gypi | ||
14 | index ee91fb1d..049c8f8c 100644 | ||
15 | --- a/common.gypi | ||
16 | +++ b/common.gypi | ||
17 | @@ -413,7 +413,7 @@ | ||
18 | 'ldflags': [ '-m32' ], | ||
19 | }], | ||
20 | [ 'target_arch=="ppc64" and OS!="aix"', { | ||
21 | - 'cflags': [ '-m64', '-mminimal-toc' ], | ||
22 | + 'cflags': [ '-m64' ], | ||
23 | 'ldflags': [ '-m64' ], | ||
24 | }], | ||
25 | [ 'target_arch=="s390x"', { | ||
26 | -- | ||
27 | 2.32.0 | ||
28 | |||
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/v8-call-new-ListFormatter-createInstance.patch b/meta-oe/recipes-devtools/nodejs/nodejs/v8-call-new-ListFormatter-createInstance.patch deleted file mode 100644 index 806360084..000000000 --- a/meta-oe/recipes-devtools/nodejs/nodejs/v8-call-new-ListFormatter-createInstance.patch +++ /dev/null | |||
@@ -1,93 +0,0 @@ | |||
1 | From 035c305ce7761f51328b45f1bd83e26aef267c9d Mon Sep 17 00:00:00 2001 | ||
2 | From: Frank Tang <ftang@chromium.org> | ||
3 | Date: Thu, 15 Oct 2020 22:44:27 -0700 | ||
4 | Subject: [PATCH] [Intl] call new ListFormatter::createInstance | ||
5 | |||
6 | The one we currently using is now marked as internal and to be removed | ||
7 | for 68. Migrating to the style which already avaiable in ICU 67-1. | ||
8 | |||
9 | Upstream-Status: Backport | ||
10 | Bug: v8:11031 | ||
11 | Change-Id: I668382a2e1b8602ddca02bf231c5008a6c92bf2d | ||
12 | Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2477751 | ||
13 | Reviewed-by: Jakob Kummerow <jkummerow@chromium.org> | ||
14 | Commit-Queue: Frank Tang <ftang@chromium.org> | ||
15 | Cr-Commit-Position: refs/heads/master@{#70638} | ||
16 | --- | ||
17 | deps/v8/src/objects/js-list-format.cc | 55 ++++++++++++----------------------- | ||
18 | 1 file changed, 18 insertions(+), 37 deletions(-) | ||
19 | |||
20 | --- a/deps/v8/src/objects/js-list-format.cc | ||
21 | +++ b/deps/v8/src/objects/js-list-format.cc | ||
22 | @@ -29,46 +29,27 @@ namespace v8 { | ||
23 | namespace internal { | ||
24 | |||
25 | namespace { | ||
26 | -const char* kStandard = "standard"; | ||
27 | -const char* kOr = "or"; | ||
28 | -const char* kUnit = "unit"; | ||
29 | -const char* kStandardShort = "standard-short"; | ||
30 | -const char* kOrShort = "or-short"; | ||
31 | -const char* kUnitShort = "unit-short"; | ||
32 | -const char* kStandardNarrow = "standard-narrow"; | ||
33 | -const char* kOrNarrow = "or-narrow"; | ||
34 | -const char* kUnitNarrow = "unit-narrow"; | ||
35 | |||
36 | -const char* GetIcuStyleString(JSListFormat::Style style, | ||
37 | - JSListFormat::Type type) { | ||
38 | +UListFormatterWidth GetIcuWidth(JSListFormat::Style style) { | ||
39 | + switch (style) { | ||
40 | + case JSListFormat::Style::LONG: | ||
41 | + return ULISTFMT_WIDTH_WIDE; | ||
42 | + case JSListFormat::Style::SHORT: | ||
43 | + return ULISTFMT_WIDTH_SHORT; | ||
44 | + case JSListFormat::Style::NARROW: | ||
45 | + return ULISTFMT_WIDTH_NARROW; | ||
46 | + } | ||
47 | + UNREACHABLE(); | ||
48 | +} | ||
49 | + | ||
50 | +UListFormatterType GetIcuType(JSListFormat::Type type) { | ||
51 | switch (type) { | ||
52 | case JSListFormat::Type::CONJUNCTION: | ||
53 | - switch (style) { | ||
54 | - case JSListFormat::Style::LONG: | ||
55 | - return kStandard; | ||
56 | - case JSListFormat::Style::SHORT: | ||
57 | - return kStandardShort; | ||
58 | - case JSListFormat::Style::NARROW: | ||
59 | - return kStandardNarrow; | ||
60 | - } | ||
61 | + return ULISTFMT_TYPE_AND; | ||
62 | case JSListFormat::Type::DISJUNCTION: | ||
63 | - switch (style) { | ||
64 | - case JSListFormat::Style::LONG: | ||
65 | - return kOr; | ||
66 | - case JSListFormat::Style::SHORT: | ||
67 | - return kOrShort; | ||
68 | - case JSListFormat::Style::NARROW: | ||
69 | - return kOrNarrow; | ||
70 | - } | ||
71 | + return ULISTFMT_TYPE_OR; | ||
72 | case JSListFormat::Type::UNIT: | ||
73 | - switch (style) { | ||
74 | - case JSListFormat::Style::LONG: | ||
75 | - return kUnit; | ||
76 | - case JSListFormat::Style::SHORT: | ||
77 | - return kUnitShort; | ||
78 | - case JSListFormat::Style::NARROW: | ||
79 | - return kUnitNarrow; | ||
80 | - } | ||
81 | + return ULISTFMT_TYPE_UNITS; | ||
82 | } | ||
83 | UNREACHABLE(); | ||
84 | } | ||
85 | @@ -143,7 +124,7 @@ MaybeHandle<JSListFormat> JSListFormat:: | ||
86 | icu::Locale icu_locale = r.icu_locale; | ||
87 | UErrorCode status = U_ZERO_ERROR; | ||
88 | icu::ListFormatter* formatter = icu::ListFormatter::createInstance( | ||
89 | - icu_locale, GetIcuStyleString(style_enum, type_enum), status); | ||
90 | + icu_locale, GetIcuType(type_enum), GetIcuWidth(style_enum), status); | ||
91 | if (U_FAILURE(status) || formatter == nullptr) { | ||
92 | delete formatter; | ||
93 | THROW_NEW_ERROR(isolate, NewRangeError(MessageTemplate::kIcuError), | ||
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_14.16.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_14.17.1.bb index 48bf2f4a8..5ac4f9dc7 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_14.16.1.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_14.17.1.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=85bf260d8b6de1588f57abc5dc66587c" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=a1016f9b7979cfe6fc3466a9bba60b1e" |
5 | 5 | ||
6 | DEPENDS = "openssl" | 6 | DEPENDS = "openssl" |
7 | DEPENDS_append_class-target = " qemu-native" | 7 | DEPENDS_append_class-target = " qemu-native" |
@@ -21,7 +21,6 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ | |||
21 | file://0004-v8-don-t-override-ARM-CFLAGS.patch \ | 21 | file://0004-v8-don-t-override-ARM-CFLAGS.patch \ |
22 | file://big-endian.patch \ | 22 | file://big-endian.patch \ |
23 | file://mips-warnings.patch \ | 23 | file://mips-warnings.patch \ |
24 | file://v8-call-new-ListFormatter-createInstance.patch \ | ||
25 | file://mips-less-memory.patch \ | 24 | file://mips-less-memory.patch \ |
26 | " | 25 | " |
27 | SRC_URI_append_class-target = " \ | 26 | SRC_URI_append_class-target = " \ |
@@ -30,7 +29,10 @@ SRC_URI_append_class-target = " \ | |||
30 | SRC_URI_append_toolchain-clang_x86 = " \ | 29 | SRC_URI_append_toolchain-clang_x86 = " \ |
31 | file://libatomic.patch \ | 30 | file://libatomic.patch \ |
32 | " | 31 | " |
33 | SRC_URI[sha256sum] = "e44adbbed6756c2c1a01258383e9f00df30c147b36e438f6369b5ef1069abac3" | 32 | SRC_URI_append_toolchain-clang_powerpc64le = " \ |
33 | file://0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch \ | ||
34 | " | ||
35 | SRC_URI[sha256sum] = "ddf1d2d56ddf35ecd98c5ea5ddcd690b245899f289559b4330c921255f5a247f" | ||
34 | 36 | ||
35 | S = "${WORKDIR}/node-v${PV}" | 37 | S = "${WORKDIR}/node-v${PV}" |
36 | 38 | ||