mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-02 01:50:18 +00:00
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>
This commit is contained in:
+28
@@ -0,0 +1,28 @@
|
|||||||
|
From 0976af0f3b328436ea44a74a406f311adb2ab211 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
|
Date: Tue, 15 Jun 2021 19:01:31 -0700
|
||||||
|
Subject: [PATCH] ppc64: Do not use -mminimal-toc with clang
|
||||||
|
|
||||||
|
clang does not support this option
|
||||||
|
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
---
|
||||||
|
common.gypi | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/common.gypi b/common.gypi
|
||||||
|
index ee91fb1d..049c8f8c 100644
|
||||||
|
--- a/common.gypi
|
||||||
|
+++ b/common.gypi
|
||||||
|
@@ -413,7 +413,7 @@
|
||||||
|
'ldflags': [ '-m32' ],
|
||||||
|
}],
|
||||||
|
[ 'target_arch=="ppc64" and OS!="aix"', {
|
||||||
|
- 'cflags': [ '-m64', '-mminimal-toc' ],
|
||||||
|
+ 'cflags': [ '-m64' ],
|
||||||
|
'ldflags': [ '-m64' ],
|
||||||
|
}],
|
||||||
|
[ 'target_arch=="s390x"', {
|
||||||
|
--
|
||||||
|
2.32.0
|
||||||
|
|
||||||
@@ -1,93 +0,0 @@
|
|||||||
From 035c305ce7761f51328b45f1bd83e26aef267c9d Mon Sep 17 00:00:00 2001
|
|
||||||
From: Frank Tang <ftang@chromium.org>
|
|
||||||
Date: Thu, 15 Oct 2020 22:44:27 -0700
|
|
||||||
Subject: [PATCH] [Intl] call new ListFormatter::createInstance
|
|
||||||
|
|
||||||
The one we currently using is now marked as internal and to be removed
|
|
||||||
for 68. Migrating to the style which already avaiable in ICU 67-1.
|
|
||||||
|
|
||||||
Upstream-Status: Backport
|
|
||||||
Bug: v8:11031
|
|
||||||
Change-Id: I668382a2e1b8602ddca02bf231c5008a6c92bf2d
|
|
||||||
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2477751
|
|
||||||
Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
|
|
||||||
Commit-Queue: Frank Tang <ftang@chromium.org>
|
|
||||||
Cr-Commit-Position: refs/heads/master@{#70638}
|
|
||||||
---
|
|
||||||
deps/v8/src/objects/js-list-format.cc | 55 ++++++++++++-----------------------
|
|
||||||
1 file changed, 18 insertions(+), 37 deletions(-)
|
|
||||||
|
|
||||||
--- a/deps/v8/src/objects/js-list-format.cc
|
|
||||||
+++ b/deps/v8/src/objects/js-list-format.cc
|
|
||||||
@@ -29,46 +29,27 @@ namespace v8 {
|
|
||||||
namespace internal {
|
|
||||||
|
|
||||||
namespace {
|
|
||||||
-const char* kStandard = "standard";
|
|
||||||
-const char* kOr = "or";
|
|
||||||
-const char* kUnit = "unit";
|
|
||||||
-const char* kStandardShort = "standard-short";
|
|
||||||
-const char* kOrShort = "or-short";
|
|
||||||
-const char* kUnitShort = "unit-short";
|
|
||||||
-const char* kStandardNarrow = "standard-narrow";
|
|
||||||
-const char* kOrNarrow = "or-narrow";
|
|
||||||
-const char* kUnitNarrow = "unit-narrow";
|
|
||||||
|
|
||||||
-const char* GetIcuStyleString(JSListFormat::Style style,
|
|
||||||
- JSListFormat::Type type) {
|
|
||||||
+UListFormatterWidth GetIcuWidth(JSListFormat::Style style) {
|
|
||||||
+ switch (style) {
|
|
||||||
+ case JSListFormat::Style::LONG:
|
|
||||||
+ return ULISTFMT_WIDTH_WIDE;
|
|
||||||
+ case JSListFormat::Style::SHORT:
|
|
||||||
+ return ULISTFMT_WIDTH_SHORT;
|
|
||||||
+ case JSListFormat::Style::NARROW:
|
|
||||||
+ return ULISTFMT_WIDTH_NARROW;
|
|
||||||
+ }
|
|
||||||
+ UNREACHABLE();
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+UListFormatterType GetIcuType(JSListFormat::Type type) {
|
|
||||||
switch (type) {
|
|
||||||
case JSListFormat::Type::CONJUNCTION:
|
|
||||||
- switch (style) {
|
|
||||||
- case JSListFormat::Style::LONG:
|
|
||||||
- return kStandard;
|
|
||||||
- case JSListFormat::Style::SHORT:
|
|
||||||
- return kStandardShort;
|
|
||||||
- case JSListFormat::Style::NARROW:
|
|
||||||
- return kStandardNarrow;
|
|
||||||
- }
|
|
||||||
+ return ULISTFMT_TYPE_AND;
|
|
||||||
case JSListFormat::Type::DISJUNCTION:
|
|
||||||
- switch (style) {
|
|
||||||
- case JSListFormat::Style::LONG:
|
|
||||||
- return kOr;
|
|
||||||
- case JSListFormat::Style::SHORT:
|
|
||||||
- return kOrShort;
|
|
||||||
- case JSListFormat::Style::NARROW:
|
|
||||||
- return kOrNarrow;
|
|
||||||
- }
|
|
||||||
+ return ULISTFMT_TYPE_OR;
|
|
||||||
case JSListFormat::Type::UNIT:
|
|
||||||
- switch (style) {
|
|
||||||
- case JSListFormat::Style::LONG:
|
|
||||||
- return kUnit;
|
|
||||||
- case JSListFormat::Style::SHORT:
|
|
||||||
- return kUnitShort;
|
|
||||||
- case JSListFormat::Style::NARROW:
|
|
||||||
- return kUnitNarrow;
|
|
||||||
- }
|
|
||||||
+ return ULISTFMT_TYPE_UNITS;
|
|
||||||
}
|
|
||||||
UNREACHABLE();
|
|
||||||
}
|
|
||||||
@@ -143,7 +124,7 @@ MaybeHandle<JSListFormat> JSListFormat::
|
|
||||||
icu::Locale icu_locale = r.icu_locale;
|
|
||||||
UErrorCode status = U_ZERO_ERROR;
|
|
||||||
icu::ListFormatter* formatter = icu::ListFormatter::createInstance(
|
|
||||||
- icu_locale, GetIcuStyleString(style_enum, type_enum), status);
|
|
||||||
+ icu_locale, GetIcuType(type_enum), GetIcuWidth(style_enum), status);
|
|
||||||
if (U_FAILURE(status) || formatter == nullptr) {
|
|
||||||
delete formatter;
|
|
||||||
THROW_NEW_ERROR(isolate, NewRangeError(MessageTemplate::kIcuError),
|
|
||||||
+5
-3
@@ -1,7 +1,7 @@
|
|||||||
DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript"
|
DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript"
|
||||||
HOMEPAGE = "http://nodejs.org"
|
HOMEPAGE = "http://nodejs.org"
|
||||||
LICENSE = "MIT & BSD & Artistic-2.0"
|
LICENSE = "MIT & BSD & Artistic-2.0"
|
||||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=85bf260d8b6de1588f57abc5dc66587c"
|
LIC_FILES_CHKSUM = "file://LICENSE;md5=a1016f9b7979cfe6fc3466a9bba60b1e"
|
||||||
|
|
||||||
DEPENDS = "openssl"
|
DEPENDS = "openssl"
|
||||||
DEPENDS_append_class-target = " qemu-native"
|
DEPENDS_append_class-target = " qemu-native"
|
||||||
@@ -21,7 +21,6 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
|
|||||||
file://0004-v8-don-t-override-ARM-CFLAGS.patch \
|
file://0004-v8-don-t-override-ARM-CFLAGS.patch \
|
||||||
file://big-endian.patch \
|
file://big-endian.patch \
|
||||||
file://mips-warnings.patch \
|
file://mips-warnings.patch \
|
||||||
file://v8-call-new-ListFormatter-createInstance.patch \
|
|
||||||
file://mips-less-memory.patch \
|
file://mips-less-memory.patch \
|
||||||
"
|
"
|
||||||
SRC_URI_append_class-target = " \
|
SRC_URI_append_class-target = " \
|
||||||
@@ -30,7 +29,10 @@ SRC_URI_append_class-target = " \
|
|||||||
SRC_URI_append_toolchain-clang_x86 = " \
|
SRC_URI_append_toolchain-clang_x86 = " \
|
||||||
file://libatomic.patch \
|
file://libatomic.patch \
|
||||||
"
|
"
|
||||||
SRC_URI[sha256sum] = "e44adbbed6756c2c1a01258383e9f00df30c147b36e438f6369b5ef1069abac3"
|
SRC_URI_append_toolchain-clang_powerpc64le = " \
|
||||||
|
file://0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch \
|
||||||
|
"
|
||||||
|
SRC_URI[sha256sum] = "ddf1d2d56ddf35ecd98c5ea5ddcd690b245899f289559b4330c921255f5a247f"
|
||||||
|
|
||||||
S = "${WORKDIR}/node-v${PV}"
|
S = "${WORKDIR}/node-v${PV}"
|
||||||
|
|
||||||
Reference in New Issue
Block a user