Re: CVS commit: pkgsrc/lang/nodejs

[Adam <adam%netbsd.org@localhost>]

> Module Name:  pkgsrc
> Committed By: ryoon
> Date:         Thu Apr 22 15:52:25 UTC 2021
> 
> Modified Files:
>       pkgsrc/lang/nodejs: Makefile distinfo
> 
> Log Message:
> nodejs: Fix build with icu-69.1
> 
> * Backported from nodejs-16.0.0.
> * Internal icu is not built under NetBSD/amd64 9.99.81 at least.
> 
> 
> To generate a diff of this commit:
> cvs rdiff -u -r1.210 -r1.211 pkgsrc/lang/nodejs/Makefile
> cvs rdiff -u -r1.194 -r1.195 pkgsrc/lang/nodejs/distinfo
> 
> Please note that diffs are not public domain; they are subject to the
> copyright notices on the relevant files.
> 
> Modified files:
> 
> Index: pkgsrc/lang/nodejs/Makefile
> diff -u pkgsrc/lang/nodejs/Makefile:1.210 pkgsrc/lang/nodejs/Makefile:1.211
> --- pkgsrc/lang/nodejs/Makefile:1.210 Wed Apr 21 11:40:27 2021
> +++ pkgsrc/lang/nodejs/Makefile       Thu Apr 22 15:52:25 2021
> @@ -1,11 +1,11 @@
> -# $NetBSD: Makefile,v 1.210 2021/04/21 11:40:27 adam Exp $
> +# $NetBSD: Makefile,v 1.211 2021/04/22 15:52:25 ryoon Exp $
> 
> DISTNAME=     node-v14.16.1
> EXTRACT_SUFX= .tar.xz
> 
> USE_LANGUAGES=        c gnu++14
> 
> -PKGREVISION= 1
> +PKGREVISION= 2
> .include "../../mk/bsd.prefs.mk"
> 
> # XXX: figure out a way to add rpaths to torque
> @@ -13,7 +13,7 @@ MAKE_ENV+=  LD_LIBRARY_PATH=${PREFIX}/lib
> 
> CONFIGURE_ARGS+=      --shared-nghttp2
> # ICU 69.1: error: 'createInstance' is a private member of 'icu_69::ListFormatter'
> -#CONFIGURE_ARGS+=    --with-intl=system-icu
> +CONFIGURE_ARGS+=     --with-intl=system-icu
> 
> PYTHON_VERSIONS_ACCEPTED=     27
> 
> @@ -34,7 +34,7 @@ CXXFLAGS+=  -mstackrealign
> .endif
> 
> .include "../../lang/nodejs/Makefile.common"
> -#.include "../../textproc/icu/buildlink3.mk"
> +.include "../../textproc/icu/buildlink3.mk"
> # Requires nghttp2_option_set_max_settings
> BUILDLINK_API_DEPENDS.nghttp2+=       nghttp2>=1.41.0
> .include "../../www/nghttp2/buildlink3.mk"
> 
> Index: pkgsrc/lang/nodejs/distinfo
> diff -u pkgsrc/lang/nodejs/distinfo:1.194 pkgsrc/lang/nodejs/distinfo:1.195
> --- pkgsrc/lang/nodejs/distinfo:1.194 Wed Apr  7 06:21:56 2021
> +++ pkgsrc/lang/nodejs/distinfo       Thu Apr 22 15:52:25 2021
> @@ -1,4 +1,4 @@
> -$NetBSD: distinfo,v 1.194 2021/04/07 06:21:56 adam Exp $
> +$NetBSD: distinfo,v 1.195 2021/04/22 15:52:25 ryoon Exp $
> 
> SHA1 (node-v14.16.1.tar.xz) = 3b8001e12cdae8b0e0fb2c1f7a8eb7f314d30cfc
> RMD160 (node-v14.16.1.tar.xz) = cf91d50c5833f8f20799bb2bbdfc9152207c50d0
> @@ -16,6 +16,7 @@ SHA1 (patch-deps_v8_src_base_platform_se
> SHA1 (patch-deps_v8_src_codegen_arm_cpu-arm.cc) = 84c75d61bc99c2ff9adeac3152f5b11ebb0e582b
> SHA1 (patch-deps_v8_src_common_globals.h) = 86637724864389f2b24251904de41669a2f00fbc
> SHA1 (patch-deps_v8_src_compiler_types.h) = 2a212282ab9d71e98ae56827fdb1d9778a6047a5
> +SHA1 (patch-deps_v8_src_objects_js-list-format.cc) = b1acf2f9890f04aba58f82012528f9a425751896
> SHA1 (patch-deps_v8_src_zone_zone.h) = 651b49d242dac8f713cccc101147ccf61f828ecb
> SHA1 (patch-deps_v8_tools_run-llprof.sh) = 39aa3faf77492ef8dd35b411b7b0e4605b469af3
> SHA1 (patch-node.gypi) = 4a104dba6c22702211009bc60a6be6f87554e2fa

You have to upload the patch and remove the comment about ICU 69.1. :)

Kind regards,
Adam