On Tue Mar 02, 2021 at 08:33:26PM +0100, Denis Fondras wrote:
> Update lang/node to the latest LTS version.
>
> Build, tests pass but I have not tried to build ports depending on it.
>
> I am a bit unsure about
> patches/patch-deps_v8_src_base_platform_platform-posix_cc though.
>
I did not look at your diff but I remember the work of Moritz Buhl and
the comments: https://marc.info/?t=159497542700005&r=1&w=2
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/lang/node/Makefile,v
> retrieving revision 1.88
> diff -u -p -r1.88 Makefile
> --- Makefile 23 Feb 2021 19:39:27 -0000 1.88
> +++ Makefile 2 Mar 2021 19:13:21 -0000
> @@ -11,12 +11,11 @@ USE_WXNEEDED = Yes
>
> COMMENT = V8 JavaScript for clients and servers
>
> -NODE_VERSION = v12.16.1
> +NODE_VERSION = v14.16.0
> PLEDGE_VER = 1.1.2
> DISTFILES = node-pledge-{}${PLEDGE_VER}.tar.gz:0 \
> ${DISTNAME}-headers.tar.gz \
> ${DISTNAME}.tar.gz
> -REVISION = 1
>
> DISTNAME = node-${NODE_VERSION}
> PKGNAME = ${DISTNAME:S/v//g}
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/lang/node/distinfo,v
> retrieving revision 1.53
> diff -u -p -r1.53 distinfo
> --- distinfo 4 Apr 2020 16:42:57 -0000 1.53
> +++ distinfo 2 Mar 2021 19:13:21 -0000
> @@ -1,6 +1,6 @@
> SHA256 (node-pledge-1.1.2.tar.gz) = zY/JcbZ32mmtqWXXNn3/9aTh7Y3F6fAAaADDA8SYwEk=
> -SHA256 (node-v12.16.1-headers.tar.gz) = gV5zJWG2vhsjibDKxT40tlrRg1pfA1TZiI2ZKkYTlH8=
> -SHA256 (node-v12.16.1.tar.gz) = T+jDRU+b7lu+ctRKolzZMYWbMDe3qUcwgbOyvRtGW5U=
> +SHA256 (node-v14.16.0-headers.tar.gz) = S0S5KQOmHCmvIFUPnSW/wwKWV99rXwoSBypwNg9+7e4=
> +SHA256 (node-v14.16.0.tar.gz) = 9rkEsGlR3kxSCJ3URWFV2FPoNbDcRkD3VFjG60n56M4=
> SIZE (node-pledge-1.1.2.tar.gz) = 3155
> -SIZE (node-v12.16.1-headers.tar.gz) = 563107
> -SIZE (node-v12.16.1.tar.gz) = 52290732
> +SIZE (node-v14.16.0-headers.tar.gz) = 597013
> +SIZE (node-v14.16.0.tar.gz) = 63145525
> Index: patches/patch-Makefile
> ===================================================================
> RCS file: /cvs/ports/lang/node/patches/patch-Makefile,v
> retrieving revision 1.10
> diff -u -p -r1.10 patch-Makefile
> --- patches/patch-Makefile 24 Nov 2019 18:42:28 -0000 1.10
> +++ patches/patch-Makefile 2 Mar 2021 19:13:21 -0000
> @@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile,v 1.10 2019/11/
> Index: Makefile
> --- Makefile.orig
> +++ Makefile
> -@@ -157,7 +157,7 @@ config.gypi: configure configure.py src/node_version.h
> +@@ -154,7 +154,7 @@ config.gypi: configure configure.py src/node_version.h
> fi
>
> .PHONY: install
> Index: patches/patch-common_gypi
> ===================================================================
> RCS file: /cvs/ports/lang/node/patches/patch-common_gypi,v
> retrieving revision 1.15
> diff -u -p -r1.15 patch-common_gypi
> --- patches/patch-common_gypi 22 Jul 2020 17:30:24 -0000 1.15
> +++ patches/patch-common_gypi 2 Mar 2021 19:13:21 -0000
> @@ -3,7 +3,7 @@ $OpenBSD: patch-common_gypi,v 1.15 2020/
> Index: common.gypi
> --- common.gypi.orig
> +++ common.gypi
> -@@ -390,7 +390,7 @@
> +@@ -404,7 +404,7 @@
> 'cflags': [ '-m32' ],
> 'ldflags': [ '-m32' ],
> }],
> @@ -12,7 +12,7 @@ Index: common.gypi
> 'cflags': [ '-m64', '-mminimal-toc' ],
> 'ldflags': [ '-m64' ],
> }],
> -@@ -497,6 +497,10 @@
> +@@ -532,6 +532,10 @@
> 'ldflags': [
> '-Wl,--export-dynamic',
> ],
> Index: patches/patch-configure_py
> ===================================================================
> RCS file: patches/patch-configure_py
> diff -N patches/patch-configure_py
> --- patches/patch-configure_py 31 Jul 2020 21:22:48 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,17 +0,0 @@
> -$OpenBSD: patch-configure_py,v 1.1 2020/07/31 21:22:48 naddy Exp $
> -
> -account for CLANG_VENDOR when checking for llvm version
> -https://github.com/nodejs/node/commit/7f70c5de7073646b7c7d972ed4704cfcfe83af92
> -
> -Index: configure.py
> ---- configure.py.orig
> -+++ configure.py
> -@@ -740,7 +740,7 @@ def get_nasm_version(asm):
> -
> - def get_llvm_version(cc):
> - return get_version_helper(
> -- cc, r"(^(?:FreeBSD )?clang version|based on LLVM) ([0-9]+\.[0-9]+)")
> -+ cc, r"(^(?:.+ )?clang version|based on LLVM) ([0-9]+\.[0-9]+)")
> -
> - def get_xcode_version(cc):
> - return get_version_helper(
> Index: patches/patch-deps_npm_lib_npm_js
> ===================================================================
> RCS file: /cvs/ports/lang/node/patches/patch-deps_npm_lib_npm_js,v
> retrieving revision 1.8
> diff -u -p -r1.8 patch-deps_npm_lib_npm_js
> --- patches/patch-deps_npm_lib_npm_js 24 Nov 2019 18:42:28 -0000 1.8
> +++ patches/patch-deps_npm_lib_npm_js 2 Mar 2021 19:13:21 -0000
> @@ -2,7 +2,7 @@ $OpenBSD: patch-deps_npm_lib_npm_js,v 1.
> Index: deps/npm/lib/npm.js
> --- deps/npm/lib/npm.js.orig
> +++ deps/npm/lib/npm.js
> -@@ -357,7 +357,7 @@
> +@@ -363,7 +363,7 @@
>
> log.resume()
>
> Index: patches/patch-deps_npm_node_modules_node-gyp_lib_install_js
> ===================================================================
> RCS file: /cvs/ports/lang/node/patches/patch-deps_npm_node_modules_node-gyp_lib_install_js,v
> retrieving revision 1.12
> diff -u -p -r1.12 patch-deps_npm_node_modules_node-gyp_lib_install_js
> --- patches/patch-deps_npm_node_modules_node-gyp_lib_install_js 4 Apr 2020 16:42:57 -0000 1.12
> +++ patches/patch-deps_npm_node_modules_node-gyp_lib_install_js 2 Mar 2021 19:13:21 -0000
> @@ -3,7 +3,7 @@ $OpenBSD: patch-deps_npm_node_modules_no
> Index: deps/npm/node_modules/node-gyp/lib/install.js
> --- deps/npm/node_modules/node-gyp/lib/install.js.orig
> +++ deps/npm/node_modules/node-gyp/lib/install.js
> -@@ -128,7 +128,7 @@ function install (fs, gyp, argv, callback) {
> +@@ -129,7 +129,7 @@ function install (fs, gyp, argv, callback) {
> }
>
> // now download the node tarball
> Index: patches/patch-deps_openssl_config_Makefile
> ===================================================================
> RCS file: /cvs/ports/lang/node/patches/patch-deps_openssl_config_Makefile,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-deps_openssl_config_Makefile
> --- patches/patch-deps_openssl_config_Makefile 24 Nov 2019 18:42:28 -0000 1.3
> +++ patches/patch-deps_openssl_config_Makefile 2 Mar 2021 19:13:21 -0000
> @@ -1,4 +1,4 @@
> -$OpenBSD: patch-deps_openssl_config_Makefile,v 1.3 2019/11/24 18:42:28 abieber Exp $
> +$OpenBSD$
>
> Index: deps/openssl/config/Makefile
> --- deps/openssl/config/Makefile.orig
> @@ -21,7 +21,7 @@ Index: deps/openssl/config/Makefile
> # Supported architecture list
> -ASM_ARCHS = aix-gcc aix64-gcc BSD-x86 BSD-x86_64 \
> +ASM_ARCHS = aix-gcc aix64-gcc BSD-x86 BSD-x86-elf BSD-x86_64 \
> - darwin64-x86_64-cc darwin-i386-cc linux-aarch64 \
> + darwin64-x86_64-cc darwin-i386-cc darwin64-arm64-cc linux-aarch64 \
> linux-armv4 linux-elf linux-x32 linux-x86_64 linux-ppc \
> linux-ppc64 linux-ppc64le linux32-s390x linux64-s390x linux64-mips64\
> @@ -17,7 +17,6 @@ solaris-x86-gcc solaris64-x86_64-gcc VC-WIN64A VC-WIN3
> Index: patches/patch-deps_openssl_config_bn_conf_asm_h
> ===================================================================
> RCS file: /cvs/ports/lang/node/patches/patch-deps_openssl_config_bn_conf_asm_h,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-deps_openssl_config_bn_conf_asm_h
> --- patches/patch-deps_openssl_config_bn_conf_asm_h 21 Jan 2019 23:46:01 -0000 1.1
> +++ patches/patch-deps_openssl_config_bn_conf_asm_h 2 Mar 2021 19:13:21 -0000
> @@ -3,7 +3,7 @@ $OpenBSD: patch-deps_openssl_config_bn_c
> Index: deps/openssl/config/bn_conf_asm.h
> --- deps/openssl/config/bn_conf_asm.h.orig
> +++ deps/openssl/config/bn_conf_asm.h
> -@@ -22,7 +22,7 @@
> +@@ -24,7 +24,7 @@
> #elif defined(_WIN32) && defined(_M_X64)
> # include "./archs/VC-WIN64A/asm/crypto/include/internal/bn_conf.h"
> #elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__)
> Index: patches/patch-deps_openssl_config_bn_conf_no-asm_h
> ===================================================================
> RCS file: /cvs/ports/lang/node/patches/patch-deps_openssl_config_bn_conf_no-asm_h,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-deps_openssl_config_bn_conf_no-asm_h
> --- patches/patch-deps_openssl_config_bn_conf_no-asm_h 24 Nov 2019 18:42:28 -0000 1.3
> +++ patches/patch-deps_openssl_config_bn_conf_no-asm_h 2 Mar 2021 19:13:21 -0000
> @@ -3,7 +3,7 @@ $OpenBSD: patch-deps_openssl_config_bn_c
> Index: deps/openssl/config/bn_conf_no-asm.h
> --- deps/openssl/config/bn_conf_no-asm.h.orig
> +++ deps/openssl/config/bn_conf_no-asm.h
> -@@ -24,7 +24,7 @@
> +@@ -26,7 +26,7 @@
> #elif defined(_WIN32) && defined(_M_ARM64)
> # include "./archs/VC-WIN64-ARM/no-asm/crypto/include/internal/bn_conf.h"
> #elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__)
> Index: patches/patch-deps_openssl_config_dso_conf_asm_h
> ===================================================================
> RCS file: /cvs/ports/lang/node/patches/patch-deps_openssl_config_dso_conf_asm_h,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-deps_openssl_config_dso_conf_asm_h
> --- patches/patch-deps_openssl_config_dso_conf_asm_h 21 Jan 2019 23:46:01 -0000 1.1
> +++ patches/patch-deps_openssl_config_dso_conf_asm_h 2 Mar 2021 19:13:21 -0000
> @@ -3,7 +3,7 @@ $OpenBSD: patch-deps_openssl_config_dso_
> Index: deps/openssl/config/dso_conf_asm.h
> --- deps/openssl/config/dso_conf_asm.h.orig
> +++ deps/openssl/config/dso_conf_asm.h
> -@@ -22,7 +22,7 @@
> +@@ -24,7 +24,7 @@
> #elif defined(_WIN32) && defined(_M_X64)
> # include "./archs/VC-WIN64A/asm/crypto/include/internal/dso_conf.h"
> #elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__)
> Index: patches/patch-deps_openssl_config_dso_conf_no-asm_h
> ===================================================================
> RCS file: /cvs/ports/lang/node/patches/patch-deps_openssl_config_dso_conf_no-asm_h,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-deps_openssl_config_dso_conf_no-asm_h
> --- patches/patch-deps_openssl_config_dso_conf_no-asm_h 24 Nov 2019 18:42:28 -0000 1.3
> +++ patches/patch-deps_openssl_config_dso_conf_no-asm_h 2 Mar 2021 19:13:21 -0000
> @@ -3,7 +3,7 @@ $OpenBSD: patch-deps_openssl_config_dso_
> Index: deps/openssl/config/dso_conf_no-asm.h
> --- deps/openssl/config/dso_conf_no-asm.h.orig
> +++ deps/openssl/config/dso_conf_no-asm.h
> -@@ -24,7 +24,7 @@
> +@@ -26,7 +26,7 @@
> #elif defined(_WIN32) && defined(_M_ARM64)
> # include "./archs/VC-WIN64-ARM/no-asm/crypto/include/internal/dso_conf.h"
> #elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__)
> Index: patches/patch-deps_openssl_config_opensslconf_asm_h
> ===================================================================
> RCS file: /cvs/ports/lang/node/patches/patch-deps_openssl_config_opensslconf_asm_h,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-deps_openssl_config_opensslconf_asm_h
> --- patches/patch-deps_openssl_config_opensslconf_asm_h 21 Jan 2019 23:46:01 -0000 1.1
> +++ patches/patch-deps_openssl_config_opensslconf_asm_h 2 Mar 2021 19:13:21 -0000
> @@ -3,7 +3,7 @@ $OpenBSD: patch-deps_openssl_config_open
> Index: deps/openssl/config/opensslconf_asm.h
> --- deps/openssl/config/opensslconf_asm.h.orig
> +++ deps/openssl/config/opensslconf_asm.h
> -@@ -109,7 +109,7 @@
> +@@ -112,7 +112,7 @@
> #elif defined(_WIN32) && defined(_M_X64)
> # include "./archs/VC-WIN64A/asm/include/openssl/opensslconf.h"
> #elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__)
> Index: patches/patch-deps_openssl_config_opensslconf_no-asm_h
> ===================================================================
> RCS file: /cvs/ports/lang/node/patches/patch-deps_openssl_config_opensslconf_no-asm_h,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-deps_openssl_config_opensslconf_no-asm_h
> --- patches/patch-deps_openssl_config_opensslconf_no-asm_h 24 Nov 2019 18:42:28 -0000 1.3
> +++ patches/patch-deps_openssl_config_opensslconf_no-asm_h 2 Mar 2021 19:13:21 -0000
> @@ -3,7 +3,7 @@ $OpenBSD: patch-deps_openssl_config_open
> Index: deps/openssl/config/opensslconf_no-asm.h
> --- deps/openssl/config/opensslconf_no-asm.h.orig
> +++ deps/openssl/config/opensslconf_no-asm.h
> -@@ -19,7 +19,7 @@
> +@@ -21,7 +21,7 @@
> #elif defined(_WIN32) && defined(_M_ARM64)
> # include "./archs/VC-WIN64-ARM/no-asm/include/openssl/opensslconf.h"
> #elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__)
> Index: patches/patch-deps_openssl_openssl_asm_gypi
> ===================================================================
> RCS file: /cvs/ports/lang/node/patches/patch-deps_openssl_openssl_asm_gypi,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-deps_openssl_openssl_asm_gypi
> --- patches/patch-deps_openssl_openssl_asm_gypi 21 Jan 2019 23:46:01 -0000 1.1
> +++ patches/patch-deps_openssl_openssl_asm_gypi 2 Mar 2021 19:13:21 -0000
> @@ -3,7 +3,7 @@ $OpenBSD: patch-deps_openssl_openssl_asm
> Index: deps/openssl/openssl_asm.gypi
> --- deps/openssl/openssl_asm.gypi.orig
> +++ deps/openssl/openssl_asm.gypi
> -@@ -22,6 +22,8 @@
> +@@ -24,6 +24,8 @@
> 'includes': ['config/archs/linux-elf/asm/openssl.gypi'],
> }, 'target_arch=="ia32" and OS=="mac"', {
> 'includes': ['config/archs/darwin-i386-cc/asm/openssl.gypi'],
> @@ -12,7 +12,7 @@ Index: deps/openssl/openssl_asm.gypi
> }, 'target_arch=="ia32" and OS=="solaris"', {
> 'includes': ['config/archs/solaris-x86-gcc/asm/openssl.gypi'],
> }, 'target_arch=="ia32" and OS=="win"', {
> -@@ -48,6 +50,8 @@
> +@@ -50,6 +52,8 @@
> 'includes': ['config/archs/BSD-x86_64/asm/openssl.gypi'],
> }, 'target_arch=="x64" and OS=="mac"', {
> 'includes': ['config/archs/darwin64-x86_64-cc/asm/openssl.gypi'],
> Index: patches/patch-deps_openssl_openssl_no_asm_gypi
> ===================================================================
> RCS file: /cvs/ports/lang/node/patches/patch-deps_openssl_openssl_no_asm_gypi,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-deps_openssl_openssl_no_asm_gypi
> --- patches/patch-deps_openssl_openssl_no_asm_gypi 21 Jan 2019 23:46:01 -0000 1.1
> +++ patches/patch-deps_openssl_openssl_no_asm_gypi 2 Mar 2021 19:13:21 -0000
> @@ -3,21 +3,14 @@ $OpenBSD: patch-deps_openssl_openssl_no_
> Index: deps/openssl/openssl_no_asm.gypi
> --- deps/openssl/openssl_no_asm.gypi.orig
> +++ deps/openssl/openssl_no_asm.gypi
> -@@ -23,6 +23,8 @@
> +@@ -23,6 +23,10 @@
> 'includes': ['config/archs/linux-elf/no-asm/openssl.gypi'],
> }, 'target_arch=="ia32" and OS=="mac"', {
> 'includes': ['config/archs/darwin-i386-cc/no-asm/openssl.gypi'],
> + }, 'target_arch=="ia32" and OS=="openbsd"', {
> + 'includes': ['config/archs/BSD-x86-elf/no-asm/openssl.gypi'],
> ++ }, 'target_arch=="x64" and OS=="openbsd"', {
> ++ 'includes': ['config/archs/BSD-x86_64/no-asm/openssl.gypi'],
> }, 'target_arch=="ia32" and OS=="solaris"', {
> 'includes': ['config/archs/solaris-x86-gcc/no-asm/openssl.gypi'],
> }, 'target_arch=="ia32" and OS=="win"', {
> -@@ -34,6 +36,8 @@
> - 'includes': ['config/archs/BSD-x86_64/no-asm/openssl.gypi'],
> - }, 'target_arch=="x64" and OS=="mac"', {
> - 'includes': ['config/archs/darwin64-x86_64-cc/no-asm/openssl.gypi'],
> -+ }, 'target_arch=="x64" and OS=="openbsd"', {
> -+ 'includes': ['config/archs/BSD-x86_64/no-asm/openssl.gypi'],
> - }, 'target_arch=="x64" and OS=="solaris"', {
> - 'includes': ['config/archs/solaris64-x86_64-gcc/no-asm/openssl.gypi'],
> - }, 'target_arch=="x64" and OS=="win"', {
> Index: patches/patch-deps_v8_src_base_cpu_cc
> ===================================================================
> RCS file: /cvs/ports/lang/node/patches/patch-deps_v8_src_base_cpu_cc,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-deps_v8_src_base_cpu_cc
> --- patches/patch-deps_v8_src_base_cpu_cc 21 Jan 2019 23:46:01 -0000 1.2
> +++ patches/patch-deps_v8_src_base_cpu_cc 2 Mar 2021 19:13:21 -0000
> @@ -3,7 +3,7 @@ $OpenBSD: patch-deps_v8_src_base_cpu_cc,
> Index: deps/v8/src/base/cpu.cc
> --- deps/v8/src/base/cpu.cc.orig
> +++ deps/v8/src/base/cpu.cc
> -@@ -424,6 +424,8 @@ CPU::CPU()
> +@@ -427,6 +427,8 @@ CPU::CPU()
>
> #if V8_OS_LINUX
>
> @@ -12,7 +12,7 @@ Index: deps/v8/src/base/cpu.cc
> CPUInfo cpu_info;
>
> // Extract implementor from the "CPU implementer" field.
> -@@ -457,6 +459,8 @@ CPU::CPU()
> +@@ -460,6 +462,8 @@ CPU::CPU()
> }
> delete[] part;
> }
> Index: patches/patch-deps_v8_src_base_platform_platform-openbsd_cc
> ===================================================================
> RCS file: /cvs/ports/lang/node/patches/patch-deps_v8_src_base_platform_platform-openbsd_cc,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-deps_v8_src_base_platform_platform-openbsd_cc
> --- patches/patch-deps_v8_src_base_platform_platform-openbsd_cc 21 Jan 2019 23:46:01 -0000 1.1
> +++ patches/patch-deps_v8_src_base_platform_platform-openbsd_cc 2 Mar 2021 19:13:21 -0000
> @@ -7,8 +7,8 @@ Index: deps/v8/src/base/platform/platfor
> // it. This injects a GC marker into the stream of events generated
> // by the kernel and allows us to synchronize V8 code log and the
> // kernel log.
> -- int size = sysconf(_SC_PAGESIZE);
> -+ size_t size = sysconf(_SC_PAGESIZE);
> +- long size = sysconf(_SC_PAGESIZE); // NOLINT: type more fit than uint64_t
> ++ size_t size = sysconf(_SC_PAGESIZE); // NOLINT: type more fit than uint64_t
> FILE* f = fopen(OS::GetGCFakeMMapFile(), "w+");
> if (f == nullptr) {
> OS::PrintError("Failed to open %s\n", OS::GetGCFakeMMapFile());
> @@ -17,7 +17,7 @@ Index: deps/v8/src/base/platform/platfor
> void* addr =
> mmap(NULL, size, PROT_READ | PROT_EXEC, MAP_PRIVATE, fileno(f), 0);
> - DCHECK(addr != MAP_FAILED);
> -- OS::Free(addr, size);
> +- CHECK(OS::Free(addr, size));
> + DCHECK_NE(MAP_FAILED, addr);
> + CHECK(Free(addr, size));
> fclose(f);
> Index: patches/patch-deps_v8_src_base_platform_platform-posix_cc
> ===================================================================
> RCS file: patches/patch-deps_v8_src_base_platform_platform-posix_cc
> diff -N patches/patch-deps_v8_src_base_platform_platform-posix_cc
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-deps_v8_src_base_platform_platform-posix_cc 2 Mar 2021 19:13:21 -0000
> @@ -0,0 +1,28 @@
> +$OpenBSD$
> +
> +Index: deps/v8/src/base/platform/platform-posix.cc
> +--- deps/v8/src/base/platform/platform-posix.cc.orig
> ++++ deps/v8/src/base/platform/platform-posix.cc
> +@@ -975,18 +975,12 @@ void Thread::SetThreadLocal(LocalStorageKey key, void*
> +
> + // static
> + void* Stack::GetStackStart() {
> +- pthread_attr_t attr;
> +- int error = pthread_getattr_np(pthread_self(), &attr);
> ++ stack_t ss;
> ++ int error;
> ++ error = pthread_stackseg_np(pthread_self(), &ss);
> + if (!error) {
> +- void* base;
> +- size_t size;
> +- error = pthread_attr_getstack(&attr, &base, &size);
> +- CHECK(!error);
> +- pthread_attr_destroy(&attr);
> +- return reinterpret_cast<uint8_t*>(base) + size;
> ++ return reinterpret_cast<uint8_t*>(ss.ss_sp) + ss.ss_size;
> + }
> +- pthread_attr_destroy(&attr);
> +-
> + #if defined(V8_LIBC_GLIBC)
> + // pthread_getattr_np can fail for the main thread. In this case
> + // just like NaCl we rely on the __libc_stack_end to give us
> Index: patches/patch-deps_v8_src_base_utils_random-number-generator_cc
> ===================================================================
> RCS file: patches/patch-deps_v8_src_base_utils_random-number-generator_cc
> diff -N patches/patch-deps_v8_src_base_utils_random-number-generator_cc
> --- patches/patch-deps_v8_src_base_utils_random-number-generator_cc 4 Apr 2020 16:42:57 -0000 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,14 +0,0 @@
> -$OpenBSD: patch-deps_v8_src_base_utils_random-number-generator_cc,v 1.3 2020/04/04 16:42:57 abieber Exp $
> -
> -Index: deps/v8/src/base/utils/random-number-generator.cc
> ---- deps/v8/src/base/utils/random-number-generator.cc.orig
> -+++ deps/v8/src/base/utils/random-number-generator.cc
> -@@ -51,7 +51,7 @@ RandomNumberGenerator::RandomNumberGenerator() {
> - result = rand_s(&second_half);
> - DCHECK_EQ(0, result);
> - SetSeed((static_cast<int64_t>(first_half) << 32) + second_half);
> --#elif V8_OS_MACOSX
> -+#elif defined(V8_OS_MACOSX) || defined(V8_OS_OPENBSD)
> - // Despite its prefix suggests it is not RC4 algorithm anymore.
> - // It always succeeds while having decent performance and
> - // no file descriptor involved.
> Index: patches/patch-lib_module_js
> ===================================================================
> RCS file: /cvs/ports/lang/node/patches/patch-lib_module_js,v
> retrieving revision 1.13
> diff -u -p -r1.13 patch-lib_module_js
> --- patches/patch-lib_module_js 4 Apr 2020 16:42:57 -0000 1.13
> +++ patches/patch-lib_module_js 2 Mar 2021 19:13:21 -0000
> @@ -3,7 +3,7 @@ $OpenBSD: patch-lib_module_js,v 1.13 202
> Index: lib/internal/modules/cjs/loader.js
> --- lib/internal/modules/cjs/loader.js.orig
> +++ lib/internal/modules/cjs/loader.js
> -@@ -1260,7 +1260,10 @@ Module._initPaths = function() {
> +@@ -1179,7 +1179,10 @@ Module._initPaths = function() {
> path.resolve(process.execPath, '..') :
> path.resolve(process.execPath, '..', '..');
>
> Index: patches/patch-node_gypi
> ===================================================================
> RCS file: /cvs/ports/lang/node/patches/patch-node_gypi,v
> retrieving revision 1.8
> diff -u -p -r1.8 patch-node_gypi
> --- patches/patch-node_gypi 4 Apr 2020 16:42:57 -0000 1.8
> +++ patches/patch-node_gypi 2 Mar 2021 19:13:21 -0000
> @@ -3,7 +3,7 @@ $OpenBSD: patch-node_gypi,v 1.8 2020/04/
> Index: node.gypi
> --- node.gypi.orig
> +++ node.gypi
> -@@ -204,11 +204,14 @@
> +@@ -203,11 +203,14 @@
> 'NODE_PLATFORM="darwin"',
> ],
> }],
> Index: patches/patch-src_cares_wrap_cc
> ===================================================================
> RCS file: patches/patch-src_cares_wrap_cc
> diff -N patches/patch-src_cares_wrap_cc
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_cares_wrap_cc 2 Mar 2021 19:13:21 -0000
> @@ -0,0 +1,13 @@
> +$OpenBSD$
> +
> +Index: src/cares_wrap.cc
> +--- src/cares_wrap.cc.orig
> ++++ src/cares_wrap.cc
> +@@ -52,6 +52,7 @@
> +
> + #if defined(__OpenBSD__)
> + # define AI_V4MAPPED 0
> ++# define AI_ALL 0
> +
No comments:
Post a Comment