[-- Attachment #1: Type: text/plain, Size: 629 bytes --] There is a new pull request by Noah-Huppert against master on the void-packages repository https://github.com/Noah-Huppert/void-packages node14 https://github.com/void-linux/void-packages/pull/23433 nodejs: update to 14.5.0 Works on my machine: ``` % ./xbps-src pkg nodejs ... snip ... % sudo xbps-install --repository "$PWD/hostdir/binpkgs/node14/" -Syu nodejs ... snip ... % node -v v14.5.0 ``` I removed the patches b/c I assume in this version they aren't needed? Someone familiar with the package should confirm this. A patch file from https://github.com/void-linux/void-packages/pull/23433.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-node14-23433.patch --] [-- Type: text/x-diff, Size: 10401 bytes --] From e1e0b6e2e2b4515671250a1511a53ab4a9593716 Mon Sep 17 00:00:00 2001 From: Noah Huppert <contact@noahh.io> Date: Tue, 7 Jul 2020 00:28:08 -0400 Subject: [PATCH] nodejs: update to 14.5.0 --- .../patches/0092-getAllFieldPositions.patch | 169 ------------------ srcpkgs/nodejs/patches/ppc32.patch | 20 --- srcpkgs/nodejs/template | 6 +- 3 files changed, 3 insertions(+), 192 deletions(-) delete mode 100644 srcpkgs/nodejs/patches/0092-getAllFieldPositions.patch delete mode 100644 srcpkgs/nodejs/patches/ppc32.patch diff --git a/srcpkgs/nodejs/patches/0092-getAllFieldPositions.patch b/srcpkgs/nodejs/patches/0092-getAllFieldPositions.patch deleted file mode 100644 index f9d3718949b..00000000000 --- a/srcpkgs/nodejs/patches/0092-getAllFieldPositions.patch +++ /dev/null @@ -1,169 +0,0 @@ -From 2b107e7670ffb43719a66ee4a55ab408a5dcf2a5 Mon Sep 17 00:00:00 2001 -From: Ujjwal Sharma <ryzokuken@disroot.org> -Date: Wed, 22 Apr 2020 12:20:17 +0530 -Subject: [PATCH] deps: V8: backport 3f8dc4b2e5ba - -Original commit message: - - [intl] Remove soon-to-be removed getAllFieldPositions - - Needed to land ICU67.1 soon. - - Bug: v8:10393 - Change-Id: I3c7737ca600d6ccfdc46ffaddfb318ce60bc7618 - Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2136489 - Reviewed-by: Jakob Kummerow <jkummerow@chromium.org> - Commit-Queue: Frank Tang <ftang@chromium.org> - Cr-Commit-Position: refs/heads/master@{#67027} - -Refs: https://github.com/v8/v8/commit/3f8dc4b2e5baf77b463334c769af85b79d8c1463 ---- - common.gypi | 2 +- - deps/v8/src/objects/js-number-format.cc | 72 +++++++++++++------------ - 2 files changed, 38 insertions(+), 36 deletions(-) - -diff --git a/src/3rdparty/chromium/v8/src/objects/js-number-format.cc b/src/3rdparty/chromium/v8/src/objects/js-number-format.cc -index 92d3e2fb82e..ced408aa173 100644 ---- deps/v8/src/objects/js-number-format.cc -+++ deps/v8/src/objects/js-number-format.cc -@@ -1197,42 +1197,31 @@ MaybeHandle<JSNumberFormat> JSNumberFormat::New(Isolate* isolate, - } - - namespace { --Maybe<icu::UnicodeString> IcuFormatNumber( -+Maybe<bool> IcuFormatNumber( - Isolate* isolate, - const icu::number::LocalizedNumberFormatter& number_format, -- Handle<Object> numeric_obj, icu::FieldPositionIterator* fp_iter) { -+ Handle<Object> numeric_obj, icu::number::FormattedNumber* formatted) { - // If it is BigInt, handle it differently. - UErrorCode status = U_ZERO_ERROR; -- icu::number::FormattedNumber formatted; - if (numeric_obj->IsBigInt()) { - Handle<BigInt> big_int = Handle<BigInt>::cast(numeric_obj); - Handle<String> big_int_string; - ASSIGN_RETURN_ON_EXCEPTION_VALUE(isolate, big_int_string, - BigInt::ToString(isolate, big_int), -- Nothing<icu::UnicodeString>()); -- formatted = number_format.formatDecimal( -+ Nothing<bool>()); -+ *formatted = number_format.formatDecimal( - {big_int_string->ToCString().get(), big_int_string->length()}, status); - } else { - double number = numeric_obj->Number(); -- formatted = number_format.formatDouble(number, status); -+ *formatted = number_format.formatDouble(number, status); - } - if (U_FAILURE(status)) { - // This happen because of icu data trimming trim out "unit". - // See https://bugs.chromium.org/p/v8/issues/detail?id=8641 -- THROW_NEW_ERROR_RETURN_VALUE(isolate, -- NewTypeError(MessageTemplate::kIcuError), -- Nothing<icu::UnicodeString>()); -- } -- if (fp_iter) { -- formatted.getAllFieldPositions(*fp_iter, status); -+ THROW_NEW_ERROR_RETURN_VALUE( -+ isolate, NewTypeError(MessageTemplate::kIcuError), Nothing<bool>()); - } -- icu::UnicodeString result = formatted.toString(status); -- if (U_FAILURE(status)) { -- THROW_NEW_ERROR_RETURN_VALUE(isolate, -- NewTypeError(MessageTemplate::kIcuError), -- Nothing<icu::UnicodeString>()); -- } -- return Just(result); -+ return Just(true); - } - - } // namespace -@@ -1243,10 +1232,16 @@ MaybeHandle<String> JSNumberFormat::FormatNumeric( - Handle<Object> numeric_obj) { - DCHECK(numeric_obj->IsNumeric()); - -- Maybe<icu::UnicodeString> maybe_format = -- IcuFormatNumber(isolate, number_format, numeric_obj, nullptr); -+ icu::number::FormattedNumber formatted; -+ Maybe<bool> maybe_format = -+ IcuFormatNumber(isolate, number_format, numeric_obj, &formatted); - MAYBE_RETURN(maybe_format, Handle<String>()); -- return Intl::ToString(isolate, maybe_format.FromJust()); -+ UErrorCode status = U_ZERO_ERROR; -+ icu::UnicodeString result = formatted.toString(status); -+ if (U_FAILURE(status)) { -+ THROW_NEW_ERROR(isolate, NewTypeError(MessageTemplate::kIcuError), String); -+ } -+ return Intl::ToString(isolate, result); - } - - namespace { -@@ -1359,12 +1354,18 @@ std::vector<NumberFormatSpan> FlattenRegionsToParts( - } - - namespace { --Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted, -- icu::FieldPositionIterator* fp_iter, -+Maybe<int> ConstructParts(Isolate* isolate, -+ icu::number::FormattedNumber* formatted, - Handle<JSArray> result, int start_index, - Handle<Object> numeric_obj, bool style_is_unit) { -+ UErrorCode status = U_ZERO_ERROR; -+ icu::UnicodeString formatted_text = formatted->toString(status); -+ if (U_FAILURE(status)) { -+ THROW_NEW_ERROR_RETURN_VALUE( -+ isolate, NewTypeError(MessageTemplate::kIcuError), Nothing<int>()); -+ } - DCHECK(numeric_obj->IsNumeric()); -- int32_t length = formatted.length(); -+ int32_t length = formatted_text.length(); - int index = start_index; - if (length == 0) return Just(index); - -@@ -1373,13 +1374,14 @@ Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted, - // other region covers some part of the formatted string. It's possible - // there's another field with exactly the same begin and end as this backdrop, - // in which case the backdrop's field_id of -1 will give it lower priority. -- regions.push_back(NumberFormatSpan(-1, 0, formatted.length())); -+ regions.push_back(NumberFormatSpan(-1, 0, formatted_text.length())); - - { -- icu::FieldPosition fp; -- while (fp_iter->next(fp)) { -- regions.push_back(NumberFormatSpan(fp.getField(), fp.getBeginIndex(), -- fp.getEndIndex())); -+ icu::ConstrainedFieldPosition cfp; -+ cfp.constrainCategory(UFIELD_CATEGORY_NUMBER); -+ while (formatted->nextPosition(cfp, status)) { -+ regions.push_back( -+ NumberFormatSpan(cfp.getField(), cfp.getStart(), cfp.getLimit())); - } - } - -@@ -1401,7 +1403,7 @@ Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted, - Handle<String> substring; - ASSIGN_RETURN_ON_EXCEPTION_VALUE( - isolate, substring, -- Intl::ToString(isolate, formatted, part.begin_pos, part.end_pos), -+ Intl::ToString(isolate, formatted_text, part.begin_pos, part.end_pos), - Nothing<int>()); - Intl::AddElement(isolate, result, index, field_type_string, substring); - ++index; -@@ -1421,14 +1423,14 @@ MaybeHandle<JSArray> JSNumberFormat::FormatToParts( - number_format->icu_number_formatter().raw(); - CHECK_NOT_NULL(fmt); - -- icu::FieldPositionIterator fp_iter; -- Maybe<icu::UnicodeString> maybe_format = -- IcuFormatNumber(isolate, *fmt, numeric_obj, &fp_iter); -+ icu::number::FormattedNumber formatted; -+ Maybe<bool> maybe_format = -+ IcuFormatNumber(isolate, *fmt, numeric_obj, &formatted); - MAYBE_RETURN(maybe_format, Handle<JSArray>()); - - Handle<JSArray> result = factory->NewJSArray(0); - Maybe<int> maybe_format_to_parts = ConstructParts( -- isolate, maybe_format.FromJust(), &fp_iter, result, 0, numeric_obj, -+ isolate, &formatted, result, 0, numeric_obj, - number_format->style() == JSNumberFormat::Style::UNIT); - MAYBE_RETURN(maybe_format_to_parts, Handle<JSArray>()); - diff --git a/srcpkgs/nodejs/patches/ppc32.patch b/srcpkgs/nodejs/patches/ppc32.patch deleted file mode 100644 index 502d471429f..00000000000 --- a/srcpkgs/nodejs/patches/ppc32.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- deps/v8/src/libsampler/sampler.cc.orig -+++ deps/v8/src/libsampler/sampler.cc -@@ -423,10 +423,17 @@ - state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.regs->link); - #else - // Some C libraries, notably Musl, define the regs member as a void pointer -+ #if !V8_TARGET_ARCH_32_BIT - state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]); - state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]); - state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]); - state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[36]); -+ #else -+ state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]); -+ state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]); -+ state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]); -+ state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[36]); -+ #endif - #endif - #elif V8_HOST_ARCH_S390 - #if V8_TARGET_ARCH_32_BIT diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template index c7dc1281b8a..528838e9ee3 100644 --- a/srcpkgs/nodejs/template +++ b/srcpkgs/nodejs/template @@ -1,7 +1,7 @@ # Template file for 'nodejs' pkgname=nodejs -version=13.2.0 -revision=3 +version=14.5.0 +revision=1 wrksrc="node-v${version}" # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079 hostmakedepends="which pkg-config python3 zlib-devel $(vopt_if icu icu-devel) @@ -17,7 +17,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>" license="MIT" homepage="https://nodejs.org/" distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz" -checksum=379dcecb721984a99dc9e16c2a096d6eb7a760d50b188582d9ce33e0478a1a5e +checksum=6de72f993f3c6b852cfd2cee6cbc09ab52f2d96145ec919b6d2ad0747ea8c3ae python_version=3 build_options="ssl libuv http_parser icu nghttp2 cares"
[-- Attachment #1: Type: text/plain, Size: 174 bytes --] New comment by ericonr on void-packages repository https://github.com/void-linux/void-packages/pull/23433#issuecomment-654593600 Comment: @q66 is it still broken for ppc?
[-- Attachment #1: Type: text/plain, Size: 155 bytes --] New comment by Noah-Huppert on void-packages repository https://github.com/void-linux/void-packages/pull/23433#issuecomment-654603280 Comment: Power PC?
[-- Attachment #1: Type: text/plain, Size: 216 bytes --] New comment by Noah-Huppert on void-packages repository https://github.com/void-linux/void-packages/pull/23433#issuecomment-654614992 Comment: CI build timed out. It took a long time to build on my laptop as well.
[-- Attachment #1: Type: text/plain, Size: 197 bytes --] New comment by fosslinux on void-packages repository https://github.com/void-linux/void-packages/pull/23433#issuecomment-654646480 Comment: Add [ci skip] to the commit message if you push again.
[-- Attachment #1: Type: text/plain, Size: 617 bytes --] There is an updated pull request by Noah-Huppert against master on the void-packages repository https://github.com/Noah-Huppert/void-packages node14 https://github.com/void-linux/void-packages/pull/23433 nodejs: update to 14.5.0 Works on my machine (`x86_64`): ``` % ./xbps-src pkg nodejs % sudo xbps-install --repository "$PWD/hostdir/binpkgs/node14/" -Syu nodejs % node -v v14.5.0 ``` I removed the patches b/c I assume in this version they aren't needed? Someone familiar with the package should confirm this. A patch file from https://github.com/void-linux/void-packages/pull/23433.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-node14-23433.patch --] [-- Type: text/x-diff, Size: 10411 bytes --] From 2c9482750858aefc9559deb0af870ee9347124ea Mon Sep 17 00:00:00 2001 From: Noah Huppert <contact@noahh.io> Date: Sat, 8 Aug 2020 00:46:01 -0400 Subject: [PATCH] [ci skip] nodejs: update to 14.5.0 --- .../patches/0092-getAllFieldPositions.patch | 169 ------------------ srcpkgs/nodejs/patches/ppc32.patch | 20 --- srcpkgs/nodejs/template | 6 +- 3 files changed, 3 insertions(+), 192 deletions(-) delete mode 100644 srcpkgs/nodejs/patches/0092-getAllFieldPositions.patch delete mode 100644 srcpkgs/nodejs/patches/ppc32.patch diff --git a/srcpkgs/nodejs/patches/0092-getAllFieldPositions.patch b/srcpkgs/nodejs/patches/0092-getAllFieldPositions.patch deleted file mode 100644 index f9d3718949b..00000000000 --- a/srcpkgs/nodejs/patches/0092-getAllFieldPositions.patch +++ /dev/null @@ -1,169 +0,0 @@ -From 2b107e7670ffb43719a66ee4a55ab408a5dcf2a5 Mon Sep 17 00:00:00 2001 -From: Ujjwal Sharma <ryzokuken@disroot.org> -Date: Wed, 22 Apr 2020 12:20:17 +0530 -Subject: [PATCH] deps: V8: backport 3f8dc4b2e5ba - -Original commit message: - - [intl] Remove soon-to-be removed getAllFieldPositions - - Needed to land ICU67.1 soon. - - Bug: v8:10393 - Change-Id: I3c7737ca600d6ccfdc46ffaddfb318ce60bc7618 - Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2136489 - Reviewed-by: Jakob Kummerow <jkummerow@chromium.org> - Commit-Queue: Frank Tang <ftang@chromium.org> - Cr-Commit-Position: refs/heads/master@{#67027} - -Refs: https://github.com/v8/v8/commit/3f8dc4b2e5baf77b463334c769af85b79d8c1463 ---- - common.gypi | 2 +- - deps/v8/src/objects/js-number-format.cc | 72 +++++++++++++------------ - 2 files changed, 38 insertions(+), 36 deletions(-) - -diff --git a/src/3rdparty/chromium/v8/src/objects/js-number-format.cc b/src/3rdparty/chromium/v8/src/objects/js-number-format.cc -index 92d3e2fb82e..ced408aa173 100644 ---- deps/v8/src/objects/js-number-format.cc -+++ deps/v8/src/objects/js-number-format.cc -@@ -1197,42 +1197,31 @@ MaybeHandle<JSNumberFormat> JSNumberFormat::New(Isolate* isolate, - } - - namespace { --Maybe<icu::UnicodeString> IcuFormatNumber( -+Maybe<bool> IcuFormatNumber( - Isolate* isolate, - const icu::number::LocalizedNumberFormatter& number_format, -- Handle<Object> numeric_obj, icu::FieldPositionIterator* fp_iter) { -+ Handle<Object> numeric_obj, icu::number::FormattedNumber* formatted) { - // If it is BigInt, handle it differently. - UErrorCode status = U_ZERO_ERROR; -- icu::number::FormattedNumber formatted; - if (numeric_obj->IsBigInt()) { - Handle<BigInt> big_int = Handle<BigInt>::cast(numeric_obj); - Handle<String> big_int_string; - ASSIGN_RETURN_ON_EXCEPTION_VALUE(isolate, big_int_string, - BigInt::ToString(isolate, big_int), -- Nothing<icu::UnicodeString>()); -- formatted = number_format.formatDecimal( -+ Nothing<bool>()); -+ *formatted = number_format.formatDecimal( - {big_int_string->ToCString().get(), big_int_string->length()}, status); - } else { - double number = numeric_obj->Number(); -- formatted = number_format.formatDouble(number, status); -+ *formatted = number_format.formatDouble(number, status); - } - if (U_FAILURE(status)) { - // This happen because of icu data trimming trim out "unit". - // See https://bugs.chromium.org/p/v8/issues/detail?id=8641 -- THROW_NEW_ERROR_RETURN_VALUE(isolate, -- NewTypeError(MessageTemplate::kIcuError), -- Nothing<icu::UnicodeString>()); -- } -- if (fp_iter) { -- formatted.getAllFieldPositions(*fp_iter, status); -+ THROW_NEW_ERROR_RETURN_VALUE( -+ isolate, NewTypeError(MessageTemplate::kIcuError), Nothing<bool>()); - } -- icu::UnicodeString result = formatted.toString(status); -- if (U_FAILURE(status)) { -- THROW_NEW_ERROR_RETURN_VALUE(isolate, -- NewTypeError(MessageTemplate::kIcuError), -- Nothing<icu::UnicodeString>()); -- } -- return Just(result); -+ return Just(true); - } - - } // namespace -@@ -1243,10 +1232,16 @@ MaybeHandle<String> JSNumberFormat::FormatNumeric( - Handle<Object> numeric_obj) { - DCHECK(numeric_obj->IsNumeric()); - -- Maybe<icu::UnicodeString> maybe_format = -- IcuFormatNumber(isolate, number_format, numeric_obj, nullptr); -+ icu::number::FormattedNumber formatted; -+ Maybe<bool> maybe_format = -+ IcuFormatNumber(isolate, number_format, numeric_obj, &formatted); - MAYBE_RETURN(maybe_format, Handle<String>()); -- return Intl::ToString(isolate, maybe_format.FromJust()); -+ UErrorCode status = U_ZERO_ERROR; -+ icu::UnicodeString result = formatted.toString(status); -+ if (U_FAILURE(status)) { -+ THROW_NEW_ERROR(isolate, NewTypeError(MessageTemplate::kIcuError), String); -+ } -+ return Intl::ToString(isolate, result); - } - - namespace { -@@ -1359,12 +1354,18 @@ std::vector<NumberFormatSpan> FlattenRegionsToParts( - } - - namespace { --Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted, -- icu::FieldPositionIterator* fp_iter, -+Maybe<int> ConstructParts(Isolate* isolate, -+ icu::number::FormattedNumber* formatted, - Handle<JSArray> result, int start_index, - Handle<Object> numeric_obj, bool style_is_unit) { -+ UErrorCode status = U_ZERO_ERROR; -+ icu::UnicodeString formatted_text = formatted->toString(status); -+ if (U_FAILURE(status)) { -+ THROW_NEW_ERROR_RETURN_VALUE( -+ isolate, NewTypeError(MessageTemplate::kIcuError), Nothing<int>()); -+ } - DCHECK(numeric_obj->IsNumeric()); -- int32_t length = formatted.length(); -+ int32_t length = formatted_text.length(); - int index = start_index; - if (length == 0) return Just(index); - -@@ -1373,13 +1374,14 @@ Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted, - // other region covers some part of the formatted string. It's possible - // there's another field with exactly the same begin and end as this backdrop, - // in which case the backdrop's field_id of -1 will give it lower priority. -- regions.push_back(NumberFormatSpan(-1, 0, formatted.length())); -+ regions.push_back(NumberFormatSpan(-1, 0, formatted_text.length())); - - { -- icu::FieldPosition fp; -- while (fp_iter->next(fp)) { -- regions.push_back(NumberFormatSpan(fp.getField(), fp.getBeginIndex(), -- fp.getEndIndex())); -+ icu::ConstrainedFieldPosition cfp; -+ cfp.constrainCategory(UFIELD_CATEGORY_NUMBER); -+ while (formatted->nextPosition(cfp, status)) { -+ regions.push_back( -+ NumberFormatSpan(cfp.getField(), cfp.getStart(), cfp.getLimit())); - } - } - -@@ -1401,7 +1403,7 @@ Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted, - Handle<String> substring; - ASSIGN_RETURN_ON_EXCEPTION_VALUE( - isolate, substring, -- Intl::ToString(isolate, formatted, part.begin_pos, part.end_pos), -+ Intl::ToString(isolate, formatted_text, part.begin_pos, part.end_pos), - Nothing<int>()); - Intl::AddElement(isolate, result, index, field_type_string, substring); - ++index; -@@ -1421,14 +1423,14 @@ MaybeHandle<JSArray> JSNumberFormat::FormatToParts( - number_format->icu_number_formatter().raw(); - CHECK_NOT_NULL(fmt); - -- icu::FieldPositionIterator fp_iter; -- Maybe<icu::UnicodeString> maybe_format = -- IcuFormatNumber(isolate, *fmt, numeric_obj, &fp_iter); -+ icu::number::FormattedNumber formatted; -+ Maybe<bool> maybe_format = -+ IcuFormatNumber(isolate, *fmt, numeric_obj, &formatted); - MAYBE_RETURN(maybe_format, Handle<JSArray>()); - - Handle<JSArray> result = factory->NewJSArray(0); - Maybe<int> maybe_format_to_parts = ConstructParts( -- isolate, maybe_format.FromJust(), &fp_iter, result, 0, numeric_obj, -+ isolate, &formatted, result, 0, numeric_obj, - number_format->style() == JSNumberFormat::Style::UNIT); - MAYBE_RETURN(maybe_format_to_parts, Handle<JSArray>()); - diff --git a/srcpkgs/nodejs/patches/ppc32.patch b/srcpkgs/nodejs/patches/ppc32.patch deleted file mode 100644 index 502d471429f..00000000000 --- a/srcpkgs/nodejs/patches/ppc32.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- deps/v8/src/libsampler/sampler.cc.orig -+++ deps/v8/src/libsampler/sampler.cc -@@ -423,10 +423,17 @@ - state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.regs->link); - #else - // Some C libraries, notably Musl, define the regs member as a void pointer -+ #if !V8_TARGET_ARCH_32_BIT - state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]); - state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]); - state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]); - state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[36]); -+ #else -+ state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]); -+ state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]); -+ state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]); -+ state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[36]); -+ #endif - #endif - #elif V8_HOST_ARCH_S390 - #if V8_TARGET_ARCH_32_BIT diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template index c7dc1281b8a..528838e9ee3 100644 --- a/srcpkgs/nodejs/template +++ b/srcpkgs/nodejs/template @@ -1,7 +1,7 @@ # Template file for 'nodejs' pkgname=nodejs -version=13.2.0 -revision=3 +version=14.5.0 +revision=1 wrksrc="node-v${version}" # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079 hostmakedepends="which pkg-config python3 zlib-devel $(vopt_if icu icu-devel) @@ -17,7 +17,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>" license="MIT" homepage="https://nodejs.org/" distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz" -checksum=379dcecb721984a99dc9e16c2a096d6eb7a760d50b188582d9ce33e0478a1a5e +checksum=6de72f993f3c6b852cfd2cee6cbc09ab52f2d96145ec919b6d2ad0747ea8c3ae python_version=3 build_options="ssl libuv http_parser icu nghttp2 cares"
[-- Attachment #1: Type: text/plain, Size: 166 bytes --] New comment by Noah-Huppert on void-packages repository https://github.com/void-linux/void-packages/pull/23433#issuecomment-670823740 Comment: Pushed with CI skip.
[-- Attachment #1: Type: text/plain, Size: 277 bytes --] New comment by bn4t on void-packages repository https://github.com/void-linux/void-packages/pull/23433#issuecomment-671084069 Comment: Would be great to have this merged. Currently can't use tailwindcss because of a bug in the version that's currently available in the repo.
[-- Attachment #1: Type: text/plain, Size: 167 bytes --] New comment by Noah-Huppert on void-packages repository https://github.com/void-linux/void-packages/pull/23433#issuecomment-671481614 Comment: Bumping to 14.7.0 rn.
[-- Attachment #1: Type: text/plain, Size: 617 bytes --] There is an updated pull request by Noah-Huppert against master on the void-packages repository https://github.com/Noah-Huppert/void-packages node14 https://github.com/void-linux/void-packages/pull/23433 nodejs: update to 14.5.0 Works on my machine (`x86_64`): ``` % ./xbps-src pkg nodejs % sudo xbps-install --repository "$PWD/hostdir/binpkgs/node14/" -Syu nodejs % node -v v14.5.0 ``` I removed the patches b/c I assume in this version they aren't needed? Someone familiar with the package should confirm this. A patch file from https://github.com/void-linux/void-packages/pull/23433.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-node14-23433.patch --] [-- Type: text/x-diff, Size: 10412 bytes --] From 7390703fe76ca024d6b2aeedfe684f9c1a38cf1e Mon Sep 17 00:00:00 2001 From: Noah Huppert <contact@noahh.io> Date: Mon, 10 Aug 2020 14:13:37 -0400 Subject: [PATCH] [ci skip] nodejs: update to 14.7.0 --- .../patches/0092-getAllFieldPositions.patch | 169 ------------------ srcpkgs/nodejs/patches/ppc32.patch | 20 --- srcpkgs/nodejs/template | 6 +- 3 files changed, 3 insertions(+), 192 deletions(-) delete mode 100644 srcpkgs/nodejs/patches/0092-getAllFieldPositions.patch delete mode 100644 srcpkgs/nodejs/patches/ppc32.patch diff --git a/srcpkgs/nodejs/patches/0092-getAllFieldPositions.patch b/srcpkgs/nodejs/patches/0092-getAllFieldPositions.patch deleted file mode 100644 index f9d3718949b..00000000000 --- a/srcpkgs/nodejs/patches/0092-getAllFieldPositions.patch +++ /dev/null @@ -1,169 +0,0 @@ -From 2b107e7670ffb43719a66ee4a55ab408a5dcf2a5 Mon Sep 17 00:00:00 2001 -From: Ujjwal Sharma <ryzokuken@disroot.org> -Date: Wed, 22 Apr 2020 12:20:17 +0530 -Subject: [PATCH] deps: V8: backport 3f8dc4b2e5ba - -Original commit message: - - [intl] Remove soon-to-be removed getAllFieldPositions - - Needed to land ICU67.1 soon. - - Bug: v8:10393 - Change-Id: I3c7737ca600d6ccfdc46ffaddfb318ce60bc7618 - Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2136489 - Reviewed-by: Jakob Kummerow <jkummerow@chromium.org> - Commit-Queue: Frank Tang <ftang@chromium.org> - Cr-Commit-Position: refs/heads/master@{#67027} - -Refs: https://github.com/v8/v8/commit/3f8dc4b2e5baf77b463334c769af85b79d8c1463 ---- - common.gypi | 2 +- - deps/v8/src/objects/js-number-format.cc | 72 +++++++++++++------------ - 2 files changed, 38 insertions(+), 36 deletions(-) - -diff --git a/src/3rdparty/chromium/v8/src/objects/js-number-format.cc b/src/3rdparty/chromium/v8/src/objects/js-number-format.cc -index 92d3e2fb82e..ced408aa173 100644 ---- deps/v8/src/objects/js-number-format.cc -+++ deps/v8/src/objects/js-number-format.cc -@@ -1197,42 +1197,31 @@ MaybeHandle<JSNumberFormat> JSNumberFormat::New(Isolate* isolate, - } - - namespace { --Maybe<icu::UnicodeString> IcuFormatNumber( -+Maybe<bool> IcuFormatNumber( - Isolate* isolate, - const icu::number::LocalizedNumberFormatter& number_format, -- Handle<Object> numeric_obj, icu::FieldPositionIterator* fp_iter) { -+ Handle<Object> numeric_obj, icu::number::FormattedNumber* formatted) { - // If it is BigInt, handle it differently. - UErrorCode status = U_ZERO_ERROR; -- icu::number::FormattedNumber formatted; - if (numeric_obj->IsBigInt()) { - Handle<BigInt> big_int = Handle<BigInt>::cast(numeric_obj); - Handle<String> big_int_string; - ASSIGN_RETURN_ON_EXCEPTION_VALUE(isolate, big_int_string, - BigInt::ToString(isolate, big_int), -- Nothing<icu::UnicodeString>()); -- formatted = number_format.formatDecimal( -+ Nothing<bool>()); -+ *formatted = number_format.formatDecimal( - {big_int_string->ToCString().get(), big_int_string->length()}, status); - } else { - double number = numeric_obj->Number(); -- formatted = number_format.formatDouble(number, status); -+ *formatted = number_format.formatDouble(number, status); - } - if (U_FAILURE(status)) { - // This happen because of icu data trimming trim out "unit". - // See https://bugs.chromium.org/p/v8/issues/detail?id=8641 -- THROW_NEW_ERROR_RETURN_VALUE(isolate, -- NewTypeError(MessageTemplate::kIcuError), -- Nothing<icu::UnicodeString>()); -- } -- if (fp_iter) { -- formatted.getAllFieldPositions(*fp_iter, status); -+ THROW_NEW_ERROR_RETURN_VALUE( -+ isolate, NewTypeError(MessageTemplate::kIcuError), Nothing<bool>()); - } -- icu::UnicodeString result = formatted.toString(status); -- if (U_FAILURE(status)) { -- THROW_NEW_ERROR_RETURN_VALUE(isolate, -- NewTypeError(MessageTemplate::kIcuError), -- Nothing<icu::UnicodeString>()); -- } -- return Just(result); -+ return Just(true); - } - - } // namespace -@@ -1243,10 +1232,16 @@ MaybeHandle<String> JSNumberFormat::FormatNumeric( - Handle<Object> numeric_obj) { - DCHECK(numeric_obj->IsNumeric()); - -- Maybe<icu::UnicodeString> maybe_format = -- IcuFormatNumber(isolate, number_format, numeric_obj, nullptr); -+ icu::number::FormattedNumber formatted; -+ Maybe<bool> maybe_format = -+ IcuFormatNumber(isolate, number_format, numeric_obj, &formatted); - MAYBE_RETURN(maybe_format, Handle<String>()); -- return Intl::ToString(isolate, maybe_format.FromJust()); -+ UErrorCode status = U_ZERO_ERROR; -+ icu::UnicodeString result = formatted.toString(status); -+ if (U_FAILURE(status)) { -+ THROW_NEW_ERROR(isolate, NewTypeError(MessageTemplate::kIcuError), String); -+ } -+ return Intl::ToString(isolate, result); - } - - namespace { -@@ -1359,12 +1354,18 @@ std::vector<NumberFormatSpan> FlattenRegionsToParts( - } - - namespace { --Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted, -- icu::FieldPositionIterator* fp_iter, -+Maybe<int> ConstructParts(Isolate* isolate, -+ icu::number::FormattedNumber* formatted, - Handle<JSArray> result, int start_index, - Handle<Object> numeric_obj, bool style_is_unit) { -+ UErrorCode status = U_ZERO_ERROR; -+ icu::UnicodeString formatted_text = formatted->toString(status); -+ if (U_FAILURE(status)) { -+ THROW_NEW_ERROR_RETURN_VALUE( -+ isolate, NewTypeError(MessageTemplate::kIcuError), Nothing<int>()); -+ } - DCHECK(numeric_obj->IsNumeric()); -- int32_t length = formatted.length(); -+ int32_t length = formatted_text.length(); - int index = start_index; - if (length == 0) return Just(index); - -@@ -1373,13 +1374,14 @@ Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted, - // other region covers some part of the formatted string. It's possible - // there's another field with exactly the same begin and end as this backdrop, - // in which case the backdrop's field_id of -1 will give it lower priority. -- regions.push_back(NumberFormatSpan(-1, 0, formatted.length())); -+ regions.push_back(NumberFormatSpan(-1, 0, formatted_text.length())); - - { -- icu::FieldPosition fp; -- while (fp_iter->next(fp)) { -- regions.push_back(NumberFormatSpan(fp.getField(), fp.getBeginIndex(), -- fp.getEndIndex())); -+ icu::ConstrainedFieldPosition cfp; -+ cfp.constrainCategory(UFIELD_CATEGORY_NUMBER); -+ while (formatted->nextPosition(cfp, status)) { -+ regions.push_back( -+ NumberFormatSpan(cfp.getField(), cfp.getStart(), cfp.getLimit())); - } - } - -@@ -1401,7 +1403,7 @@ Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted, - Handle<String> substring; - ASSIGN_RETURN_ON_EXCEPTION_VALUE( - isolate, substring, -- Intl::ToString(isolate, formatted, part.begin_pos, part.end_pos), -+ Intl::ToString(isolate, formatted_text, part.begin_pos, part.end_pos), - Nothing<int>()); - Intl::AddElement(isolate, result, index, field_type_string, substring); - ++index; -@@ -1421,14 +1423,14 @@ MaybeHandle<JSArray> JSNumberFormat::FormatToParts( - number_format->icu_number_formatter().raw(); - CHECK_NOT_NULL(fmt); - -- icu::FieldPositionIterator fp_iter; -- Maybe<icu::UnicodeString> maybe_format = -- IcuFormatNumber(isolate, *fmt, numeric_obj, &fp_iter); -+ icu::number::FormattedNumber formatted; -+ Maybe<bool> maybe_format = -+ IcuFormatNumber(isolate, *fmt, numeric_obj, &formatted); - MAYBE_RETURN(maybe_format, Handle<JSArray>()); - - Handle<JSArray> result = factory->NewJSArray(0); - Maybe<int> maybe_format_to_parts = ConstructParts( -- isolate, maybe_format.FromJust(), &fp_iter, result, 0, numeric_obj, -+ isolate, &formatted, result, 0, numeric_obj, - number_format->style() == JSNumberFormat::Style::UNIT); - MAYBE_RETURN(maybe_format_to_parts, Handle<JSArray>()); - diff --git a/srcpkgs/nodejs/patches/ppc32.patch b/srcpkgs/nodejs/patches/ppc32.patch deleted file mode 100644 index 502d471429f..00000000000 --- a/srcpkgs/nodejs/patches/ppc32.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- deps/v8/src/libsampler/sampler.cc.orig -+++ deps/v8/src/libsampler/sampler.cc -@@ -423,10 +423,17 @@ - state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.regs->link); - #else - // Some C libraries, notably Musl, define the regs member as a void pointer -+ #if !V8_TARGET_ARCH_32_BIT - state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]); - state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]); - state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]); - state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[36]); -+ #else -+ state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]); -+ state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]); -+ state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]); -+ state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[36]); -+ #endif - #endif - #elif V8_HOST_ARCH_S390 - #if V8_TARGET_ARCH_32_BIT diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template index c7dc1281b8a..b5641b870e0 100644 --- a/srcpkgs/nodejs/template +++ b/srcpkgs/nodejs/template @@ -1,7 +1,7 @@ # Template file for 'nodejs' pkgname=nodejs -version=13.2.0 -revision=3 +version=14.7.0 +revision=1 wrksrc="node-v${version}" # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079 hostmakedepends="which pkg-config python3 zlib-devel $(vopt_if icu icu-devel) @@ -17,7 +17,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>" license="MIT" homepage="https://nodejs.org/" distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz" -checksum=379dcecb721984a99dc9e16c2a096d6eb7a760d50b188582d9ce33e0478a1a5e +checksum=2a34cc5b7386259b1c601ae9e538a3a10403493fa42d3bcd95004782331a56ef python_version=3 build_options="ssl libuv http_parser icu nghttp2 cares"
[-- Attachment #1: Type: text/plain, Size: 217 bytes --] New comment by Noah-Huppert on void-packages repository https://github.com/void-linux/void-packages/pull/23433#issuecomment-671529286 Comment: Now PR is for nodejs 14.7.0. Build took ~1:30 hours so skipping the CI.
[-- Attachment #1: Type: text/plain, Size: 297 bytes --] New comment by q5sys on void-packages repository https://github.com/void-linux/void-packages/pull/23433#issuecomment-689713998 Comment: This would be a really helpful update as some versions in the Node 13.x range have buggy ES module support or need --experimental-modules at the command line.
[-- Attachment #1: Type: text/plain, Size: 194 bytes --] New comment by Noah-Huppert on void-packages repository https://github.com/void-linux/void-packages/pull/23433#issuecomment-689727021 Comment: Not really sure why the PR hasn't been merged...
[-- Attachment #1: Type: text/plain, Size: 763 bytes --] New comment by q5sys on void-packages repository https://github.com/void-linux/void-packages/pull/23433#issuecomment-689733274 Comment: yea idk. I was thinking of seeing if I could figure out the 14.10 release but checked to see if there were any outstanding PRs for a newer version, and sure enough I found your PR. On Wed, Sep 9, 2020 at 2:05 PM Noah Huppert <notifications@github.com> wrote: > Not really sure why the PR hasn't been merged... > > — > You are receiving this because you commented. > Reply to this email directly, view it on GitHub > <https://github.com/void-linux/void-packages/pull/23433#issuecomment-689727021>, > or unsubscribe > <https://github.com/notifications/unsubscribe-auth/ABDQJJ33KQU3K4ZZBWOSIOTSE67V7ANCNFSM4OSNF4EQ> > . >
[-- Attachment #1: Type: text/plain, Size: 176 bytes --] New comment by Noah-Huppert on void-packages repository https://github.com/void-linux/void-packages/pull/23433#issuecomment-689733468 Comment: bumping this PR to 4.10.0 now.
[-- Attachment #1: Type: text/plain, Size: 183 bytes --] New comment by Johnnynator on void-packages repository https://github.com/void-linux/void-packages/pull/23433#issuecomment-689745556 Comment: I will look into this PR this weekend.
[-- Attachment #1: Type: text/plain, Size: 2111 bytes --] New comment by Noah-Huppert on void-packages repository https://github.com/void-linux/void-packages/pull/23433#issuecomment-689751704 Comment: > bumping this PR to 4.10.0 now. Having issues, I wonder if 4.10.0 requires new dependencies. ``` g++ -o /builddir/node-v14.10.0/out/Release/obj.target/libnode/src/node.o ../src/node.cc '-DV8_DEPRECATION_WARNINGS' '-DV8_IMMINENT_DEPRECATION_WARNINGS' '-D__STDC_FORMAT_MACROS' '-DOPENSSL_NO_PINSHARED' '-DOPENSSL_THREADS' '-DNODE_ARCH="x64"' '-DNODE_PLATFORM="linux"' '-DNODE_WANT_INTERNALS=1' '-DV8_DEPRECATION_WARNINGS=1' '-DNODE_OPENSSL_SYSTEM_CERT_PATH=""' '-DHAVE_INSPECTOR=1' '-DNODE_ENABLE_LARGE_CODE_PAGES=1' '-D__POSIX__' '-DNODE_USE_V8_PLATFORM=1' '-DNODE_HAVE_I18N_SUPPORT=1' '-DHAVE_OPENSSL=1' -I../src -I/builddir/node-v14.10.0/out/Release/obj/gen -I/builddir/node-v14.10.0/out/Release/obj/gen/include -I/builddir/node-v14.10.0/out/Release/obj/gen/src -I../deps/histogram/src -I../deps/uvwasi/include -I../deps/v8/include -I../deps/brotli/c/include -I../deps/openssl/openssl/include -Wall -Wextra -Wno-unused-parameter -pthread -Wall -Wextra -Wno-unused-parameter -m64 -O3 -fno-omit-frame-pointer -fno-rtti -fno-exceptions -std=gnu++1y -MMD -MF /builddir/node-v14.10.0/out/Release/.deps//builddir/node-v14.10.0/out/Release/obj.target/libnode/src/node.o.d.raw -fstack-clash-protection -D_FORTIFY_SOURCE=2 -mtune=generic -O2 -pipe -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -c ../src/node.cc: In function 'int node::Start(int, char**)': ../src/node.cc:1092:42: error: 'UV_METRICS_IDLE_TIME' was not declared in this scope 1092 | uv_loop_configure(uv_default_loop(), UV_METRICS_IDLE_TIME); | ^~~~~~~~~~~~~~~~~~~~ make[1]: *** [libnode.target.mk:313: /builddir/node-v14.10.0/out/Release/obj.target/libnode/src/node.o] Error 1 rm 80455764c1d44a2c5307476ee8e59d862d62cc4f.intermediate make: *** [Makefile:104: node] Error 2 => ERROR: nodejs-14.10.0_1: do_build: 'make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1' exited with 2 => ERROR: in do_build() at srcpkgs/nodejs/template:101 ```
[-- Attachment #1: Type: text/plain, Size: 2113 bytes --] New comment by Noah-Huppert on void-packages repository https://github.com/void-linux/void-packages/pull/23433#issuecomment-689751704 Comment: > bumping this PR to 4.10.0 now. Having issues, I wonder if 4.10.0 requires new dependencies. ``` g++ -o /builddir/node-v14.10.0/out/Release/obj.target/libnode/src/node.o ../src/node.cc '-DV8_DEPRECATION_WARNINGS' '-DV8_IMMINENT_DEPRECATION_WARNINGS' '-D__STDC_FORMAT_MACROS' '-DOPENSSL_NO_PINSHARED' '-DOPENSSL_THREADS' '-DNODE_ARCH="x64"' '-DNODE_PLATFORM="linux"' '-DNODE_WANT_INTERNALS=1' '-DV8_DEPRECATION_WARNINGS=1' '-DNODE_OPENSSL_SYSTEM_CERT_PATH=""' '-DHAVE_INSPECTOR=1' '-DNODE_ENABLE_LARGE_CODE_PAGES=1' '-D__POSIX__' '-DNODE_USE_V8_PLATFORM=1' '-DNODE_HAVE_I18N_SUPPORT=1' '-DHAVE_OPENSSL=1' -I../src -I/builddir/node-v14.10.0/out/Release/obj/gen -I/builddir/node-v14.10.0/out/Release/obj/gen/include -I/builddir/node-v14.10.0/out/Release/obj/gen/src -I../deps/histogram/src -I../deps/uvwasi/include -I../deps/v8/include -I../deps/brotli/c/include -I../deps/openssl/openssl/include -Wall -Wextra -Wno-unused-parameter -pthread -Wall -Wextra -Wno-unused-parameter -m64 -O3 -fno-omit-frame-pointer -fno-rtti -fno-exceptions -std=gnu++1y -MMD -MF /builddir/node-v14.10.0/out/Release/.deps//builddir/node-v14.10.0/out/Release/obj.target/libnode/src/node.o.d.raw -fstack-clash-protection -D_FORTIFY_SOURCE=2 -mtune=generic -O2 -pipe -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -c ../src/node.cc: In function 'int node::Start(int, char**)': ../src/node.cc:1092:42: error: 'UV_METRICS_IDLE_TIME' was not declared in this scope 1092 | uv_loop_configure(uv_default_loop(), UV_METRICS_IDLE_TIME); | ^~~~~~~~~~~~~~~~~~~~ make[1]: *** [libnode.target.mk:313: /builddir/node-v14.10.0/out/Release/obj.target/libnode/src/node.o] Error 1 rm 80455764c1d44a2c5307476ee8e59d862d62cc4f.intermediate make: *** [Makefile:104: node] Error 2 => ERROR: nodejs-14.10.0_1: do_build: 'make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1' exited with 2 => ERROR: in do_build() at srcpkgs/nodejs/template:101 ```
[-- Attachment #1: Type: text/plain, Size: 2275 bytes --] New comment by Johnnynator on void-packages repository https://github.com/void-linux/void-packages/pull/23433#issuecomment-689753234 Comment: > > bumping this PR to 4.10.0 now. > > Having issues, I wonder if 4.10.0 requires new dependencies. > > ``` > g++ -o /builddir/node-v14.10.0/out/Release/obj.target/libnode/src/node.o ../src/node.cc '-DV8_DEPRECATION_WARNINGS' '-DV8_IMMINENT_DEPRECATION_WARNINGS' '-D__STDC_FORMAT_MACROS' '-DOPENSSL_NO_PINSHARED' '-DOPENSSL_THREADS' '-DNODE_ARCH="x64"' '-DNODE_PLATFORM="linux"' '-DNODE_WANT_INTERNALS=1' '-DV8_DEPRECATION_WARNINGS=1' '-DNODE_OPENSSL_SYSTEM_CERT_PATH=""' '-DHAVE_INSPECTOR=1' '-DNODE_ENABLE_LARGE_CODE_PAGES=1' '-D__POSIX__' '-DNODE_USE_V8_PLATFORM=1' '-DNODE_HAVE_I18N_SUPPORT=1' '-DHAVE_OPENSSL=1' -I../src -I/builddir/node-v14.10.0/out/Release/obj/gen -I/builddir/node-v14.10.0/out/Release/obj/gen/include -I/builddir/node-v14.10.0/out/Release/obj/gen/src -I../deps/histogram/src -I../deps/uvwasi/include -I../deps/v8/include -I../deps/brotli/c/include -I../deps/openssl/openssl/include -Wall -Wextra -Wno-unused-parameter -pthread -Wall -Wextra -Wno-unused-parameter -m64 -O3 -fno-omit-frame-pointer -fno-rtti -fno-exceptions -std=gnu++1y -MMD -MF /builddir/node-v14.10.0/out/Release/.deps//builddir/node-v14.10.0/out/Release/obj.target/libnode/src/node.o.d.raw -fstack-clash-protection -D_FORTIFY_SOURCE=2 -mtune=generic -O2 -pipe -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -c > ../src/node.cc: In function 'int node::Start(int, char**)': > ../src/node.cc:1092:42: error: 'UV_METRICS_IDLE_TIME' was not declared in this scope > 1092 | uv_loop_configure(uv_default_loop(), UV_METRICS_IDLE_TIME); > | ^~~~~~~~~~~~~~~~~~~~ > make[1]: *** [libnode.target.mk:313: /builddir/node-v14.10.0/out/Release/obj.target/libnode/src/node.o] Error 1 > rm 80455764c1d44a2c5307476ee8e59d862d62cc4f.intermediate > make: *** [Makefile:104: node] Error 2 > => ERROR: nodejs-14.10.0_1: do_build: 'make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1' exited with 2 > => ERROR: in do_build() at srcpkgs/nodejs/template:101 > ``` https://nodejs.org/en/blog/release/v14.9.0/ ^ they upgraded to libuv 1.39. So the libuv package in Void also needs updating.
[-- Attachment #1: Type: text/plain, Size: 339 bytes --] New comment by Johnnynator on void-packages repository https://github.com/void-linux/void-packages/pull/23433#issuecomment-691294524 Comment: Nodejs 14 (12.18.3 also) do have a broken `--shared-libuv` config flag, they do link against `out/Release/obj.target/deps/uv/libuv.a` first, and to `-luv` only later. Which also should be fixed.
[-- Attachment #1: Type: text/plain, Size: 158 bytes --] New comment by leahneukirchen on void-packages repository https://github.com/void-linux/void-packages/pull/23433#issuecomment-691523604 Comment: f88309c3d3
[-- Attachment #1: Type: text/plain, Size: 452 bytes --] There's a closed pull request on the void-packages repository nodejs: update to 14.7.0 https://github.com/void-linux/void-packages/pull/23433 Description: Works on my machine (`x86_64`): ``` % ./xbps-src pkg nodejs % sudo xbps-install --repository "$PWD/hostdir/binpkgs/node14/" -Syu nodejs % node -v v14.5.0 ``` I removed the patches b/c I assume in this version they aren't needed? Someone familiar with the package should confirm this.
[-- Attachment #1: Type: text/plain, Size: 202 bytes --] New comment by Noah-Huppert on void-packages repository https://github.com/void-linux/void-packages/pull/23433#issuecomment-691534733 Comment: @leahneukirchen THANK YOU! Appreciate you very much 😁