On 2020-08-28 22:56, Aaron Bieber wrote:
> On Fri, 28 Aug 2020 at 18:30:25 +0200, Moritz Buhl wrote:
>> Hi,
>>
>> I came up with something new. Only icu4c is used from ports now
>> as it is allowed according to some documentation.
>> I might have ruined this diff if so I will give up and sorry
>> for wasting your time.
>>
>> Sincerely yours,
>> mbuhl
>>
>> Index: lang/node/Makefile
>> ===================================================================
>> RCS file: /cvs/ports/lang/node/Makefile,v
>> retrieving revision 1.87
>> diff -u -p -r1.87 Makefile
>> --- lang/node/Makefile 22 Jul 2020 17:30:24 -0000 1.87
>> +++ lang/node/Makefile 28 Aug 2020 16:29:46 -0000
>> @@ -1,4 +1,4 @@
>> -# $OpenBSD: Makefile,v 1.87 2020/07/22 17:30:24 jasper Exp $
>> +# $OpenBSD$
>>
>> # XXX:
>> # - Needs __ARM_NR_cacheflush (or the like) to work on arm-based
>> ports.
>> @@ -11,12 +11,11 @@ USE_WXNEEDED = Yes
>>
>> COMMENT = V8 JavaScript for clients and servers
>>
>> -NODE_VERSION = v12.16.1
>> +NODE_VERSION = v12.18.3
>> 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}
>> @@ -35,11 +34,13 @@ MASTER_SITES = ${HOMEPAGE}dist/${NODE_V
>> MODULES = lang/python
>> MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
>>
>> -WANTLIB += c execinfo kvm m pthread util ${COMPILER_LIBCXX}
>> +WANTLIB += c execinfo kvm m pthread util icui18n icuuc icudata \
>> + ${COMPILER_LIBCXX}
>>
>> COMPILER = base-clang ports-gcc
>>
>> -LIB_DEPENDS = devel/libexecinfo
>> +LIB_DEPENDS = devel/libexecinfo \
>> + textproc/icu4c
>>
>> USE_GMAKE = Yes
>>
>> @@ -54,7 +55,7 @@ CONFIGURE_SCRIPT = ${MODPY_BIN} configur
>>
>> # libpath and includes aren't picked up, but I added them here as a
>> note.
>> # The patch for node.gyp is where they are actually being set.
>> -CONFIGURE_ARGS = --prefix=${PREFIX}
>> +CONFIGURE_ARGS = --prefix=${PREFIX} --with-intl=system-icu
>>
>> .if "${MACHINE_ARCH}" == "aarch64" || "${MACHINE_ARCH}" ==
>> "powerpc64"
>> CONFIGURE_ARGS += --openssl-no-asm
>> @@ -91,12 +92,18 @@ pre-configure:
>> ${WRKDIST}/node.gyp \
>> ${WRKDIST}/common.gypi \
>> ${WRKDIST}/tools/test.py
>> + sed -i 's/-ldl//' ${WRKSRC}/deps/uv/uv.gyp \
>> + ${WRKSRC}/deps/v8/tools/run-wasm-api-tests.py \
>> + ${WRKSRC}/tools/gyp/tools/emacs/testdata/media.gyp \
>> + ${WRKSRC}/tools/gyp/tools/emacs/testdata/media.gyp.fontified \
>> + ${WRKSRC}/tools/v8_gypfiles/v8.gyp
>> + rm -rf ${WRKSRC}/deps/icu-small
>> cd ${WRKDIST}/deps/openssl/config && \
>> ${MAKE_PROGRAM} ASM_ARCHS=BSD-x86-elf NO_ASM_ARCHS=
>>
>> post-configure:
>> - sed -i 's/-ldl //' ${WRKSRC}/out/deps/openssl/openssl.target.mk
>> - sed -i 's/-ldl //' ${WRKSRC}/out/deps/openssl/openssl-cli.target.mk
>> + sed -i 's/-ldl //' ${WRKSRC}/out/deps/openssl/openssl.target.mk \
>> + ${WRKSRC}/out/deps/openssl/openssl-cli.target.mk
>>
>> post-install:
>> ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
>> Index: lang/node/distinfo
>> ===================================================================
>> RCS file: /cvs/ports/lang/node/distinfo,v
>> retrieving revision 1.53
>> diff -u -p -r1.53 distinfo
>> --- lang/node/distinfo 4 Apr 2020 16:42:57 -0000 1.53
>> +++ lang/node/distinfo 28 Aug 2020 16:29:46 -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-v12.18.3-headers.tar.gz) =
>> Fk7cceRs+GrF2fysANxpwJuwlhS3Z8THdap3R7QugYg=
>> +SHA256 (node-v12.18.3.tar.gz) =
>> bqhfgOAbAHzJtWa4g2UTvFECZn2DO61MEJK+YPpgwtQ=
>> 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-v12.18.3-headers.tar.gz) = 555440
>> +SIZE (node-v12.18.3.tar.gz) = 52449074
>> Index: lang/node/patches/patch-Makefile
>> ===================================================================
>> RCS file: lang/node/patches/patch-Makefile
>> diff -N lang/node/patches/patch-Makefile
>> --- lang/node/patches/patch-Makefile 24 Nov 2019 18:42:28 -0000 1.10
>> +++ /dev/null 1 Jan 1970 00:00:00 -0000
>> @@ -1,27 +0,0 @@
>> -$OpenBSD: patch-Makefile,v 1.10 2019/11/24 18:42:28 abieber Exp $
>> -
>> -Index: Makefile
>> ---- Makefile.orig
>> -+++ Makefile
>> -@@ -157,7 +157,7 @@ config.gypi: configure configure.py
>> src/node_version.h
>> - fi
>> -
>> - .PHONY: install
>> --install: all ## Installs node into $PREFIX (default=/usr/local).
>> -+install: all build-pledge ## Installs node into $PREFIX
>> (default=/usr/local).
>> - $(PYTHON) tools/install.py $@ '$(DESTDIR)' '$(PREFIX)'
>> -
>> - .PHONY: uninstall
>> -@@ -401,6 +401,12 @@ test/addons/.buildstamp: $(ADDONS_PREREQS) \
>> - # Just goes to show that recursive make really is harmful...
>> - # TODO(bnoordhuis) Force rebuild after gyp update.
>> - build-addons: | $(NODE_EXE) test/addons/.buildstamp
>> -+
>> -+build-pledge: $(NODE_EXE)
>> -+ $(NODE) deps/npm/node_modules/node-gyp/bin/node-gyp rebuild \
>> -+ --directory="deps/npm/node_modules/node-pledge" \
>> -+ --nodedir="$(shell pwd)" && \
>> -+ $(RM) -rf
>> deps/npm/node_modules/node-pledge/build/Release/{.deps,../Makefile,obj.target}
>> -
>> - JS_NATIVE_API_BINDING_GYPS := \
>> - $(filter-out test/js-native-api/??_*/binding.gyp, \
>
> If you remove this patch you should also remove the dist file. That
> said, I am
> not entirely sure you meant to remove this as the previous diff still
> had it.
>
> It's worth noting that removing this might break people's setups until
> they npm
> install the missing lib.
>
>> ...
Yes, I messed that up.
New diff below.
Index: lang/node/Makefile
===================================================================
RCS file: /cvs/ports/lang/node/Makefile,v
retrieving revision 1.87
diff -u -p -r1.87 Makefile
--- lang/node/Makefile 22 Jul 2020 17:30:24 -0000 1.87
+++ lang/node/Makefile 1 Sep 2020 14:54:18 -0000
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.87 2020/07/22 17:30:24 jasper Exp $
+# $OpenBSD$
# XXX:
# - Needs __ARM_NR_cacheflush (or the like) to work on arm-based ports.
@@ -11,12 +11,11 @@ USE_WXNEEDED = Yes
COMMENT = V8 JavaScript for clients and servers
-NODE_VERSION = v12.16.1
+NODE_VERSION = v12.18.3
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}
@@ -35,11 +34,13 @@ MASTER_SITES = ${HOMEPAGE}dist/${NODE_V
MODULES = lang/python
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
-WANTLIB += c execinfo kvm m pthread util ${COMPILER_LIBCXX}
+WANTLIB += c execinfo kvm m pthread util icui18n icuuc icudata \
+ ${COMPILER_LIBCXX}
COMPILER = base-clang ports-gcc
-LIB_DEPENDS = devel/libexecinfo
+LIB_DEPENDS = devel/libexecinfo \
+ textproc/icu4c
USE_GMAKE = Yes
@@ -54,7 +55,7 @@ CONFIGURE_SCRIPT = ${MODPY_BIN} configur
# libpath and includes aren't picked up, but I added them here as a
note.
# The patch for node.gyp is where they are actually being set.
-CONFIGURE_ARGS = --prefix=${PREFIX}
+CONFIGURE_ARGS = --prefix=${PREFIX} --with-intl=system-icu
.if "${MACHINE_ARCH}" == "aarch64" || "${MACHINE_ARCH}" == "powerpc64"
CONFIGURE_ARGS += --openssl-no-asm
@@ -91,12 +92,18 @@ pre-configure:
${WRKDIST}/node.gyp \
${WRKDIST}/common.gypi \
${WRKDIST}/tools/test.py
+ sed -i 's/-ldl//' ${WRKSRC}/deps/uv/uv.gyp \
+ ${WRKSRC}/deps/v8/tools/run-wasm-api-tests.py \
+ ${WRKSRC}/tools/gyp/tools/emacs/testdata/media.gyp \
+ ${WRKSRC}/tools/gyp/tools/emacs/testdata/media.gyp.fontified \
+ ${WRKSRC}/tools/v8_gypfiles/v8.gyp
+ rm -rf ${WRKSRC}/deps/icu-small
cd ${WRKDIST}/deps/openssl/config && \
${MAKE_PROGRAM} ASM_ARCHS=BSD-x86-elf NO_ASM_ARCHS=
post-configure:
- sed -i 's/-ldl //' ${WRKSRC}/out/deps/openssl/openssl.target.mk
- sed -i 's/-ldl //' ${WRKSRC}/out/deps/openssl/openssl-cli.target.mk
+ sed -i 's/-ldl //' ${WRKSRC}/out/deps/openssl/openssl.target.mk \
+ ${WRKSRC}/out/deps/openssl/openssl-cli.target.mk
post-install:
${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
Index: lang/node/distinfo
===================================================================
RCS file: /cvs/ports/lang/node/distinfo,v
retrieving revision 1.53
diff -u -p -r1.53 distinfo
--- lang/node/distinfo 4 Apr 2020 16:42:57 -0000 1.53
+++ lang/node/distinfo 1 Sep 2020 14:54:18 -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-v12.18.3-headers.tar.gz) =
Fk7cceRs+GrF2fysANxpwJuwlhS3Z8THdap3R7QugYg=
+SHA256 (node-v12.18.3.tar.gz) =
bqhfgOAbAHzJtWa4g2UTvFECZn2DO61MEJK+YPpgwtQ=
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-v12.18.3-headers.tar.gz) = 555440
+SIZE (node-v12.18.3.tar.gz) = 52449074
Index: lang/node/patches/patch-configure_py
===================================================================
RCS file: lang/node/patches/patch-configure_py
diff -N lang/node/patches/patch-configure_py
--- lang/node/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: lang/node/patches/patch-src_cares_wrap_cc
===================================================================
RCS file: lang/node/patches/patch-src_cares_wrap_cc
diff -N lang/node/patches/patch-src_cares_wrap_cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/node/patches/patch-src_cares_wrap_cc 1 Sep 2020 14:54:18 -0000
@@ -0,0 +1,22 @@
+$OpenBSD$
+
+Index: src/cares_wrap.cc
+--- src/cares_wrap.cc.orig
++++ src/cares_wrap.cc
+@@ -38,6 +38,8 @@
+ #ifdef __POSIX__
+ # include <netdb.h>
+
No comments:
Post a Comment