openbsd/ports
1
0
Fork 0
mirror of https://github.com/openbsd/ports.git synced 2026-06-17 23:13:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

lang/node: update to v18.17.1

Browse Source 
ok gonzalo@
This commit is contained in:
volker
2023-08-15 13:46:30 +00:00
parent 173e56e04e
commit 8cead09774
11 changed files with 386 additions and 6571 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lang/node/Makefile
+1 -2
View File
@@ -5,7 +5,7 @@ USE_WXNEEDED = Yes
COMMENT = JavaScript runtime built on Chrome's V8 JavaScript engine
NODE_VERSION = v18.16.1
NODE_VERSION = v18.17.1
PLEDGE_VER = 1.1.3
DISTFILES = node-pledge-{}${PLEDGE_VER}.tar.gz:0 \
${DISTNAME}-headers.tar.gz \
@@ -13,7 +13,6 @@ DISTFILES = node-pledge-{}${PLEDGE_VER}.tar.gz:0 \
DISTNAME = node-${NODE_VERSION}
PKGNAME = ${DISTNAME:S/v//g}
REVISION = 2
EPOCH = 0
MASTER_SITES0 = https://github.com/qbit/node-pledge/archive/
lang/node/distinfo
+4 -4
View File
@@ -1,6 +1,6 @@
SHA256 (node-pledge-1.1.3.tar.gz) = fEaXvLg6hYEJ69K+mgQFizf8DiJY2/DtyFJB/pEanVU=
SHA256 (node-v18.16.1-headers.tar.gz) = jHLwhhI3cxo+KSpL4rals8D1EUr+OjoCtfrTXXs7LMI=
SHA256 (node-v18.16.1.tar.xz) = 6EBPjI2J/f336Vu7xgZr0OVxrLpY9USSWZthX77v4nI=
SHA256 (node-v18.17.1-headers.tar.gz) = BO5D9bJyADec9TH5VNTeKJtIcMNhYcSNQn+nQb4+Z/s=
SHA256 (node-v18.17.1.tar.xz) = 8hXPA9DwDwesC2dMaBn4BMFULhbxUtoEmAAirsz15lo=
SIZE (node-pledge-1.1.3.tar.gz) = 3167
SIZE (node-v18.16.1-headers.tar.gz) = 8576395
SIZE (node-v18.16.1.tar.xz) = 40462540
SIZE (node-v18.17.1-headers.tar.gz) = 8576937
SIZE (node-v18.17.1.tar.xz) = 40788836
lang/node/patches/patch-configure_py
+1 -1
View File
@@ -1,7 +1,7 @@
Index: configure.py
--- configure.py.orig
+++ configure.py
@@ -1565,6 +1565,10 @@ def configure_v8(o):
@@ -1560,6 +1560,10 @@ def configure_v8(o):
raise Exception(
'Only one of the --v8-enable-object-print or --v8-disable-object-print options '
'can be specified at a time.')
lang/node/patches/patch-deps_simdutf_simdutf_cpp
-6154
View File
File diff suppressed because it is too large Load Diff
lang/node/patches/patch-deps_simdutf_simdutf_h
-196
View File
@@ -1,196 +0,0 @@
From b7f13a86792faa53d6b263e0f688cc80867a2088 Mon Sep 17 00:00:00 2001
From: "Node.js GitHub Bot" <github-bot@iojs.org>
Date: Sun, 14 May 2023 20:40:22 +0100
Subject: [PATCH] deps: update simdutf to 3.2.9
Re: https://github.com/simdutf/simdutf/issues/242
This release adds a check that the OS supports AVX-512 (previously it
was checking CPU support but not whether it worked with the OS). Fixes
SIGILL on OpenBSD with some Intel CPUs.
Index: deps/simdutf/simdutf.h
--- deps/simdutf/simdutf.h.orig
+++ deps/simdutf/simdutf.h
@@ -1,11 +1,11 @@
-/* auto-generated on 2023-02-24 17:01:43 -0500. Do not edit! */
-// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/include, filename=simdutf.h
+/* auto-generated on 2023-05-12 15:20:29 -0400. Do not edit! */
+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/include, filename=simdutf.h
/* begin file include/simdutf.h */
#ifndef SIMDUTF_H
#define SIMDUTF_H
#include <cstring>
-// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/include, filename=simdutf/compiler_check.h
+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/include, filename=simdutf/compiler_check.h
/* begin file include/simdutf/compiler_check.h */
#ifndef SIMDUTF_COMPILER_CHECK_H
#define SIMDUTF_COMPILER_CHECK_H
@@ -43,13 +43,13 @@
#endif // SIMDUTF_COMPILER_CHECK_H
/* end file include/simdutf/compiler_check.h */
-// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/include, filename=simdutf/common_defs.h
+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/include, filename=simdutf/common_defs.h
/* begin file include/simdutf/common_defs.h */
#ifndef SIMDUTF_COMMON_DEFS_H
#define SIMDUTF_COMMON_DEFS_H
#include <cassert>
-// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/include, filename=simdutf/portability.h
+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/include, filename=simdutf/portability.h
/* begin file include/simdutf/portability.h */
#ifndef SIMDUTF_PORTABILITY_H
#define SIMDUTF_PORTABILITY_H
@@ -144,6 +144,8 @@
// POWER processors. Please see https://github.com/lemire/simdutf/issues/51
#elif defined(__s390__)
// s390 IBM system. Big endian.
+#elif (defined(__riscv) || defined(__riscv__)) && __riscv_xlen == 64
+// RISC-V 64-bit
#else
// The simdutf library is designed
// for 64-bit processors and it seems that you are not
@@ -278,7 +280,7 @@ use a 64-bit target such as x64, 64-bit ARM or 64-bit
#endif // SIMDUTF_PORTABILITY_H
/* end file include/simdutf/portability.h */
-// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/include, filename=simdutf/avx512.h
+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/include, filename=simdutf/avx512.h
/* begin file include/simdutf/avx512.h */
#ifndef SIMDUTF_AVX512_H_
#define SIMDUTF_AVX512_H_
@@ -479,7 +481,7 @@ use a 64-bit target such as x64, 64-bit ARM or 64-bit
#endif // SIMDUTF_COMMON_DEFS_H
/* end file include/simdutf/common_defs.h */
-// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/include, filename=simdutf/encoding_types.h
+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/include, filename=simdutf/encoding_types.h
/* begin file include/simdutf/encoding_types.h */
#include <string>
@@ -527,7 +529,7 @@ size_t bom_byte_size(encoding_type bom);
} // BOM namespace
} // simdutf namespace
/* end file include/simdutf/encoding_types.h */
-// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/include, filename=simdutf/error.h
+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/include, filename=simdutf/error.h
/* begin file include/simdutf/error.h */
#ifndef ERROR_H
#define ERROR_H
@@ -564,7 +566,7 @@ SIMDUTF_PUSH_DISABLE_WARNINGS
SIMDUTF_DISABLE_UNDESIRED_WARNINGS
// Public API
-// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/include, filename=simdutf/simdutf_version.h
+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/include, filename=simdutf/simdutf_version.h
/* begin file include/simdutf/simdutf_version.h */
// /include/simdutf/simdutf_version.h automatically generated by release.py,
// do not change by hand
@@ -572,7 +574,7 @@ SIMDUTF_DISABLE_UNDESIRED_WARNINGS
#define SIMDUTF_SIMDUTF_VERSION_H
/** The version of simdutf being used (major.minor.revision) */
-#define SIMDUTF_VERSION "3.2.2"
+#define SIMDUTF_VERSION "3.2.9"
namespace simdutf {
enum {
@@ -587,13 +589,13 @@ enum {
/**
* The revision (major.minor.REVISION) of simdutf being used.
*/
- SIMDUTF_VERSION_REVISION = 2
+ SIMDUTF_VERSION_REVISION = 9
};
} // namespace simdutf
#endif // SIMDUTF_SIMDUTF_VERSION_H
/* end file include/simdutf/simdutf_version.h */
-// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/include, filename=simdutf/implementation.h
+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/include, filename=simdutf/implementation.h
/* begin file include/simdutf/implementation.h */
#ifndef SIMDUTF_IMPLEMENTATION_H
#define SIMDUTF_IMPLEMENTATION_H
@@ -603,7 +605,7 @@ enum {
#endif
#include <vector>
#include <tuple>
-// dofile: invoked with prepath=/Users/dlemire/CVS/github/simdutf/include, filename=simdutf/internal/isadetection.h
+// dofile: invoked with prepath=/Users/lemire/CVS/github/simdutf/include, filename=simdutf/internal/isadetection.h
/* begin file include/simdutf/internal/isadetection.h */
/* From
https://github.com/endorno/pytorch/blob/master/torch/lib/TH/generic/simd/simd.h
@@ -706,6 +708,7 @@ namespace cpuid_bit {
// EAX = 0x01
constexpr uint32_t pclmulqdq = uint32_t(1) << 1; ///< @private bit 1 of ECX for EAX=0x1
constexpr uint32_t sse42 = uint32_t(1) << 20; ///< @private bit 20 of ECX for EAX=0x1
+ constexpr uint32_t osxsave = (uint32_t(1) << 26) | (uint32_t(1) << 27); ///< @private bits 26+27 of ECX for EAX=0x1
// EAX = 0x7f (Structured Extended Feature Flags), ECX = 0x00 (Sub-leaf)
// See: "Table 3-8. Information Returned by CPUID Instruction"
@@ -731,6 +734,10 @@ namespace cpuid_bit {
namespace edx {
constexpr uint32_t avx512vp2intersect = uint32_t(1) << 8;
}
+ namespace xcr0_bit {
+ constexpr uint64_t avx256_saved = uint64_t(1) << 2; ///< @private bit 2 = AVX
+ constexpr uint64_t avx512_saved = uint64_t(7) << 5; ///< @private bits 5,6,7 = opmask, ZMM_hi256, hi16_ZMM
+ }
}
}
@@ -740,7 +747,7 @@ static inline void cpuid(uint32_t *eax, uint32_t *ebx,
uint32_t *edx) {
#if defined(_MSC_VER)
int cpu_info[4];
- __cpuid(cpu_info, *eax);
+ __cpuidex(cpu_info, *eax, *ecx);
*eax = cpu_info[0];
*ebx = cpu_info[1];
*ecx = cpu_info[2];
@@ -758,6 +765,16 @@ static inline void cpuid(uint32_t *eax, uint32_t *ebx,
#endif
}
+static inline uint64_t xgetbv() {
+ #if defined(_MSC_VER)
+ return _xgetbv(0);
+ #else
+ uint32_t xcr0_lo, xcr0_hi;
+ asm volatile("xgetbv\n\t" : "=a" (xcr0_lo), "=d" (xcr0_hi) : "c" (0));
+ return xcr0_lo | ((uint64_t)xcr0_hi << 32);
+ #endif
+ }
+
static inline uint32_t detect_supported_architectures() {
uint32_t eax;
uint32_t ebx = 0;
@@ -777,6 +794,16 @@ static inline uint32_t detect_supported_architectures(
host_isa |= instruction_set::PCLMULQDQ;
}
+ if ((ecx & cpuid_bit::osxsave) != cpuid_bit::osxsave) {
+ return host_isa;
+ }
+
+ // xgetbv for checking if the OS saves registers
+ uint64_t xcr0 = xgetbv();
+
+ if ((xcr0 & cpuid_bit::xcr0_bit::avx256_saved) == 0) {
+ return host_isa;
+ }
// ECX for EAX=0x7
eax = 0x7;
ecx = 0x0; // Sub-leaf = 0
@@ -789,6 +816,9 @@ static inline uint32_t detect_supported_architectures(
}
if (ebx & cpuid_bit::ebx::bmi2) {
host_isa |= instruction_set::BMI2;
+ }
+ if (!((xcr0 & cpuid_bit::xcr0_bit::avx512_saved) == cpuid_bit::xcr0_bit::avx512_saved)) {
+ return host_isa;
}
if (ebx & cpuid_bit::ebx::avx512f) {
host_isa |= instruction_set::AVX512F;
lang/node/patches/patch-lib_net_js
+1 -1
View File
@@ -13,7 +13,7 @@ for "any address" but that's not really a straightforward change).
Index: lib/net.js
--- lib/net.js.orig
+++ lib/net.js
@@ -1702,22 +1702,12 @@ function setupListenHandle(address, port, addressType,
@@ -1713,22 +1713,12 @@ function setupListenHandle(address, port, addressType,
let rval = null;
lang/node/patches/patch-node_gyp
+3 -3
View File
@@ -4,7 +4,7 @@ devel/gtest if installed.
Index: node.gyp
--- node.gyp.orig
+++ node.gyp
@@ -464,7 +464,7 @@
@@ -465,7 +465,7 @@
],
'dependencies': [
'deps/base64/base64.gyp:base64',
@@ -13,7 +13,7 @@ Index: node.gyp
'deps/histogram/histogram.gyp:histogram',
'deps/uvwasi/uvwasi.gyp:uvwasi',
'deps/simdutf/simdutf.gyp:simdutf',
@@ -1211,8 +1211,8 @@
@@ -1216,8 +1216,8 @@
'dependencies': [
'<(node_lib_target_name)',
'deps/base64/base64.gyp:base64',
@@ -24,7 +24,7 @@ Index: node.gyp
'deps/histogram/histogram.gyp:histogram',
'deps/uvwasi/uvwasi.gyp:uvwasi',
'node_dtrace_header',
@@ -1287,6 +1287,10 @@
@@ -1293,6 +1293,10 @@
}],
['OS=="solaris"', {
'ldflags': [ '-I<(SHARED_INTERMEDIATE_DIR)' ]
lang/node/patches/patch-src_env_cc
+1 -1
View File
@@ -1,7 +1,7 @@
Index: src/env.cc
--- src/env.cc.orig
+++ src/env.cc
@@ -613,29 +613,7 @@ std::unique_ptr<v8::BackingStore> Environment::release
@@ -614,29 +614,7 @@ std::unique_ptr<v8::BackingStore> Environment::release
}
std::string GetExecPath(const std::vector<std::string>& argv) {
lang/node/patches/patch-tools_test_py
+1 -1
View File
@@ -1,7 +1,7 @@
Index: tools/test.py
--- tools/test.py.orig
+++ tools/test.py
@@ -944,9 +944,9 @@ class Context(object):
@@ -937,9 +937,9 @@ class Context(object):
if self.vm is not None:
return self.vm
if arch == 'none':
lang/node/patches/patch-tools_v8_gypfiles_v8_gyp
+1 -1
View File
@@ -44,7 +44,7 @@ Index: tools/v8_gypfiles/v8.gyp
'link_settings': {
'libraries': ['-latomic', ],
},
@@ -1434,6 +1437,9 @@
@@ -1438,6 +1441,9 @@
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"mksnapshot.*?sources = ")',
],
'conditions': [
lang/node/pkg/PLIST
+373 -207
View File
File diff suppressed because it is too large Load Diff