CVS commit: pkgsrc/lang/nodejs

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Thu Jan 10 13:02:41 UTC 2019

Modified Files:
        pkgsrc/lang/nodejs: Makefile.common distinfo
        pkgsrc/lang/nodejs/patches:
            patch-deps_openssl_config_opensslconf__asm.h
            patch-deps_openssl_config_opensslconf__no-asm.h
            patch-deps_openssl_openssl-cl__asm.gypi
            patch-deps_openssl_openssl-cl__no__asm.gypi
            patch-deps_openssl_openssl__asm.gypi
            patch-deps_openssl_openssl__no__asm.gypi
Added Files:
        pkgsrc/lang/nodejs/patches: patch-deps_v8_src_arm_assembler-arm-inl.h
            patch-deps_v8_src_arm_assembler-arm.cc

Log Message:
Fix build under NetBSD/earmv7hf-el


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/lang/nodejs/Makefile.common
cvs rdiff -u -r1.141 -r1.142 pkgsrc/lang/nodejs/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/nodejs/patches/patch-deps_openssl_config_opensslconf__asm.h \
    pkgsrc/lang/nodejs/patches/patch-deps_openssl_config_opensslconf__no-asm.h \
    pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl-cl__asm.gypi \
    pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl-cl__no__asm.gypi \
    pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl__asm.gypi \
    pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl__no__asm.gypi
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/nodejs/patches/patch-deps_v8_src_arm_assembler-arm-inl.h \
    pkgsrc/lang/nodejs/patches/patch-deps_v8_src_arm_assembler-arm.cc

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.common
diff -u pkgsrc/lang/nodejs/Makefile.common:1.25 pkgsrc/lang/nodejs/Makefile.common:1.26
--- pkgsrc/lang/nodejs/Makefile.common:1.25     Sat Dec 15 21:12:21 2018
+++ pkgsrc/lang/nodejs/Makefile.common  Thu Jan 10 13:02:41 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.25 2018/12/15 21:12:21 wiz Exp $
+# $NetBSD: Makefile.common,v 1.26 2019/01/10 13:02:41 ryoon Exp $
 # used by lang/nodejs/Makefile
 # used by lang/nodejs6/Makefile
 # used by lang/nodejs8/Makefile
@@ -43,6 +43,7 @@ REPLACE_PYTHON+=      tools/gyp/pylib/gyp/flo
 
 .if ${OPSYS} == "NetBSD"
 BUILD_DEPENDS+=        lockf-[0-9]*:../../sysutils/lockf
+BUILDLINK_TRANSFORM+=  rm:-ldl
 .endif
 
 TEST_TARGET=           check

Index: pkgsrc/lang/nodejs/distinfo
diff -u pkgsrc/lang/nodejs/distinfo:1.141 pkgsrc/lang/nodejs/distinfo:1.142
--- pkgsrc/lang/nodejs/distinfo:1.141   Tue Jan  8 14:51:10 2019
+++ pkgsrc/lang/nodejs/distinfo Thu Jan 10 13:02:41 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.141 2019/01/08 14:51:10 adam Exp $
+$NetBSD: distinfo,v 1.142 2019/01/10 13:02:41 ryoon Exp $
 
 SHA1 (node-v10.15.0.tar.gz) = 82d9507bed032ad5ed07881fbb87db4e5734a996
 RMD160 (node-v10.15.0.tar.gz) = bc81fcc79a316ec00db5dfcfcad0666d51379d5d
@@ -6,14 +6,16 @@ SHA512 (node-v10.15.0.tar.gz) = ad8ecc89
 Size (node-v10.15.0.tar.gz) = 36300933 bytes
 SHA1 (patch-common.gypi) = de37949f38d9bd39a18b59d59ec74e528bd323ac
 SHA1 (patch-deps_cares_cares.gyp) = 2235eb44bc984fa2e745fdf1786f1ae6de6ef80f
-SHA1 (patch-deps_openssl_config_opensslconf__asm.h) = 7b074ebd5353dff662ac66cf4012926f12dd7b7e
-SHA1 (patch-deps_openssl_config_opensslconf__no-asm.h) = 4b2eb51f6369c2acd328421cd896b8471234c0c8
-SHA1 (patch-deps_openssl_openssl-cl__asm.gypi) = a7966d08e45120c55ff5ec62c6f6bf944212af2d
-SHA1 (patch-deps_openssl_openssl-cl__no__asm.gypi) = f90a0cbdbe5d2088f892fdc6586d0fe9c612b8d5
-SHA1 (patch-deps_openssl_openssl__asm.gypi) = fef6c4e4a416e967510140463552541d24eb03a4
-SHA1 (patch-deps_openssl_openssl__no__asm.gypi) = 0c3a647a01cdd39417dc7ea00a96cbf244ece9b2
+SHA1 (patch-deps_openssl_config_opensslconf__asm.h) = 62a05829240a504dae3c04b0f4ec1428810d456b
+SHA1 (patch-deps_openssl_config_opensslconf__no-asm.h) = 9fd4acc86deb7da00cb501654713dfa2b26f412e
+SHA1 (patch-deps_openssl_openssl-cl__asm.gypi) = 3254dd37670faa19be8ac51e8195e30cc27ea42f
+SHA1 (patch-deps_openssl_openssl-cl__no__asm.gypi) = 86592025ab1d04dbef23d1d2725196e5d5b6fc4e
+SHA1 (patch-deps_openssl_openssl__asm.gypi) = 8d58f6177cc7b5b58f8ed1a69121da2685195d78
+SHA1 (patch-deps_openssl_openssl__no__asm.gypi) = 588d5943c1ef24cafd0be182e080d67747a941d2
 SHA1 (patch-deps_uv_common.gypi) = d38a9c8d9e3522f15812aec2f5b1e1e636d4bab3
 SHA1 (patch-deps_uv_src_unix_netbsd.c) = c19ff4024f828018364793d9dea013c991cfb93f
+SHA1 (patch-deps_v8_src_arm_assembler-arm-inl.h) = 56a5d6539d31e19673ef61cc91f003109c69dc29
+SHA1 (patch-deps_v8_src_arm_assembler-arm.cc) = f32d5d2a1096f822c813eaf6d02b9348564213f6
 SHA1 (patch-deps_v8_src_arm_cpu-arm.cc) = d0d11ac474ab109a6f40b26fa457b12d742eb48d
 SHA1 (patch-deps_v8_src_base_atomicops.h) = 552d2b7781b39b93392fd00043b1cf4cb10802da
 SHA1 (patch-deps_v8_src_base_platform_platform-freebsd.cc) = 427c7712fc1c2872fc48e593f7ab491c69ee44e3
@@ -28,7 +30,7 @@ SHA1 (patch-node.gypi) = 4a104dba6c22702
 SHA1 (patch-src_cares__wrap.cc) = a26a162f130468cbc0650a33b27b71377d273704
 SHA1 (patch-src_inspector__agent.cc) = 6066c01b671a1d416440b073a7a21fdf22eef926
 SHA1 (patch-src_node__postmortem__metadata.cc) = 9938482d724ad6636af5dc3fa719ec26ed8539ff
-SHA1 (patch-tools_gyp_pylib_gyp_common.py) = 585dd239415da146fa50ed86e42dd99080e86002
+SHA1 (patch-tools_gyp_pylib_gyp_common.py) = 8d76b78e46b0ba2fef08294872e17a068d595f32
 SHA1 (patch-tools_gyp_pylib_gyp_generator_make.py) = be3cc1aaa85c3d59b6f2758df813cb5ad8d8f74e
 SHA1 (patch-tools_gyp_pylib_gyp_xcode__emulation.py) = 15937c419f3226ab280c7bcd5d726773cb5add57
 SHA1 (patch-tools_install.py) = aae60d31e8c2e74f18c61c328913412545943d79

Index: pkgsrc/lang/nodejs/patches/patch-deps_openssl_config_opensslconf__asm.h
diff -u pkgsrc/lang/nodejs/patches/patch-deps_openssl_config_opensslconf__asm.h:1.1 pkgsrc/lang/nodejs/patches/patch-deps_openssl_config_opensslconf__asm.h:1.2
--- pkgsrc/lang/nodejs/patches/patch-deps_openssl_config_opensslconf__asm.h:1.1 Thu May  3 21:19:16 2018
+++ pkgsrc/lang/nodejs/patches/patch-deps_openssl_config_opensslconf__asm.h     Thu Jan 10 13:02:41 2019
@@ -1,9 +1,18 @@
-$NetBSD: patch-deps_openssl_config_opensslconf__asm.h,v 1.1 2018/05/03 21:19:16 fhajny Exp $
+$NetBSD: patch-deps_openssl_config_opensslconf__asm.h,v 1.2 2019/01/10 13:02:41 ryoon Exp $
 
 Add support for NetBSD.
 
---- deps/openssl/config/opensslconf_asm.h.orig 2018-04-24 14:41:19.000000000 +0000
+--- deps/openssl/config/opensslconf_asm.h.orig 2018-12-10 21:19:03.000000000 +0000
 +++ deps/openssl/config/opensslconf_asm.h
+@@ -96,7 +96,7 @@
+ # include "./archs/linux-x32/asm/include/openssl/opensslconf.h"
+ #elif defined(OPENSSL_LINUX) && defined(__x86_64__)
+ # include "./archs/linux-x86_64/asm/include/openssl/opensslconf.h"
+-#elif defined(OPENSSL_LINUX) && defined(__arm__)
++#elif (defined(OPENSSL_LINUX) || defined(__NetBSD__)) && defined(__arm__)
+ # include "./archs/linux-armv4/asm/include/openssl/opensslconf.h"
+ #elif defined(OPENSSL_LINUX) && defined(__aarch64__)
+ # include "./archs/linux-aarch64/asm/include/openssl/opensslconf.h"
 @@ -108,9 +108,9 @@
  # include "./archs/VC-WIN32/asm/include/openssl/opensslconf.h"
  #elif defined(_WIN32) && defined(_M_X64)
Index: pkgsrc/lang/nodejs/patches/patch-deps_openssl_config_opensslconf__no-asm.h
diff -u pkgsrc/lang/nodejs/patches/patch-deps_openssl_config_opensslconf__no-asm.h:1.1 pkgsrc/lang/nodejs/patches/patch-deps_openssl_config_opensslconf__no-asm.h:1.2
--- pkgsrc/lang/nodejs/patches/patch-deps_openssl_config_opensslconf__no-asm.h:1.1      Thu May  3 21:19:16 2018
+++ pkgsrc/lang/nodejs/patches/patch-deps_openssl_config_opensslconf__no-asm.h  Thu Jan 10 13:02:41 2019
@@ -1,9 +1,18 @@
-$NetBSD: patch-deps_openssl_config_opensslconf__no-asm.h,v 1.1 2018/05/03 21:19:16 fhajny Exp $
+$NetBSD: patch-deps_openssl_config_opensslconf__no-asm.h,v 1.2 2019/01/10 13:02:41 ryoon Exp $
 
 Add support for NetBSD.
 
---- deps/openssl/config/opensslconf_no-asm.h.orig      2018-04-24 14:41:19.000000000 +0000
+--- deps/openssl/config/opensslconf_no-asm.h.orig      2018-12-10 21:19:03.000000000 +0000
 +++ deps/openssl/config/opensslconf_no-asm.h
+@@ -4,7 +4,7 @@
+ # include "./archs/linux-x32/no-asm/include/openssl/opensslconf.h"
+ #elif defined(OPENSSL_LINUX) && defined(__x86_64__)
+ # include "./archs/linux-x86_64/no-asm/include/openssl/opensslconf.h"
+-#elif defined(OPENSSL_LINUX) && defined(__arm__)
++#elif (defined(OPENSSL_LINUX) || defined(__NetBSD__)) && defined(__arm__)
+ # include "./archs/linux-armv4/no-asm/include/openssl/opensslconf.h"
+ #elif defined(OPENSSL_LINUX) && defined(__aarch64__)
+ # include "./archs/linux-aarch64/no-asm/include/openssl/opensslconf.h"
 @@ -16,9 +16,9 @@
  # include "./archs/VC-WIN32/no-asm/include/openssl/opensslconf.h"
  #elif defined(_WIN32) && defined(_M_X64)
Index: pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl-cl__asm.gypi
diff -u pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl-cl__asm.gypi:1.1 pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl-cl__asm.gypi:1.2
--- pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl-cl__asm.gypi:1.1      Thu May  3 21:19:16 2018
+++ pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl-cl__asm.gypi  Thu Jan 10 13:02:41 2019
@@ -1,13 +1,15 @@
-$NetBSD: patch-deps_openssl_openssl-cl__asm.gypi,v 1.1 2018/05/03 21:19:16 fhajny Exp $
+$NetBSD: patch-deps_openssl_openssl-cl__asm.gypi,v 1.2 2019/01/10 13:02:41 ryoon Exp $
 
 Add support for NetBSD.
 
---- deps/openssl/openssl-cl_asm.gypi.orig      2018-04-24 14:41:19.000000000 +0000
+--- deps/openssl/openssl-cl_asm.gypi.orig      2018-12-10 21:19:03.000000000 +0000
 +++ deps/openssl/openssl-cl_asm.gypi
-@@ -31,6 +31,8 @@
+@@ -31,6 +31,10 @@
        'includes': ['config/archs/linux-elf/asm/openssl-cl.gypi'],
      }, 'target_arch=="x64" and OS=="freebsd"', {
        'includes': ['config/archs/BSD-x86_64/asm/openssl-cl.gypi'],
++    }, 'target_arch=="arm" and OS=="netbsd"', {
++      'includes': ['config/archs/linux-armv4/asm/openssl-cl.gypi'],
 +    }, 'target_arch=="x64" and OS=="netbsd"', {
 +      'includes': ['config/archs/BSD-x86_64/asm/openssl-cl.gypi'],
      }, 'target_arch=="x64" and OS=="mac"', {
Index: pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl-cl__no__asm.gypi
diff -u pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl-cl__no__asm.gypi:1.1 pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl-cl__no__asm.gypi:1.2
--- pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl-cl__no__asm.gypi:1.1  Thu May  3 21:19:16 2018
+++ pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl-cl__no__asm.gypi      Thu Jan 10 13:02:41 2019
@@ -1,15 +1,17 @@
-$NetBSD: patch-deps_openssl_openssl-cl__no__asm.gypi,v 1.1 2018/05/03 21:19:16 fhajny Exp $
+$NetBSD: patch-deps_openssl_openssl-cl__no__asm.gypi,v 1.2 2019/01/10 13:02:41 ryoon Exp $
 
 Add support for NetBSD.
 
---- deps/openssl/openssl-cl_no_asm.gypi.orig   2018-04-24 14:41:19.000000000 +0000
+--- deps/openssl/openssl-cl_no_asm.gypi.orig   2018-12-10 21:19:03.000000000 +0000
 +++ deps/openssl/openssl-cl_no_asm.gypi
-@@ -31,6 +31,8 @@
+@@ -31,6 +31,10 @@
        'includes': ['config/archs/linux-elf/no-asm/openssl-cl.gypi'],
      }, 'target_arch=="x64" and OS=="freebsd"', {
        'includes': ['config/archs/BSD-x86_64/no-asm/openssl-cl.gypi'],
 +    }, 'target_arch=="x64" and OS=="netbsd"', {
 +      'includes': ['config/archs/BSD-x86_64/no-asm/openssl-cl.gypi'],
++    }, 'target_arch=="arm" and OS=="netbsd"', {
++      'includes': ['config/archs/linux-armv4/no-asm/openssl-cl.gypi'],
      }, 'target_arch=="x64" and OS=="mac"', {
        'includes': ['config/archs/darwin64-x86_64-cc/no-asm/openssl-cl.gypi'],
      }, 'target_arch=="x64" and OS=="solaris"', {
Index: pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl__asm.gypi
diff -u pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl__asm.gypi:1.1 pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl__asm.gypi:1.2
--- pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl__asm.gypi:1.1 Thu May  3 21:19:16 2018
+++ pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl__asm.gypi     Thu Jan 10 13:02:41 2019
@@ -1,13 +1,15 @@
-$NetBSD: patch-deps_openssl_openssl__asm.gypi,v 1.1 2018/05/03 21:19:16 fhajny Exp $
+$NetBSD: patch-deps_openssl_openssl__asm.gypi,v 1.2 2019/01/10 13:02:41 ryoon Exp $
 
 Add support for NetBSD.
 
---- deps/openssl/openssl_asm.gypi.orig 2018-04-24 14:41:22.000000000 +0000
+--- deps/openssl/openssl_asm.gypi.orig 2018-12-10 21:19:04.000000000 +0000
 +++ deps/openssl/openssl_asm.gypi
-@@ -46,6 +46,8 @@
+@@ -46,6 +46,10 @@
        'includes': ['config/archs/linux-elf/asm/openssl.gypi'],
      }, 'target_arch=="x64" and OS=="freebsd"', {
        'includes': ['config/archs/BSD-x86_64/asm/openssl.gypi'],
++    }, 'target_arch=="arm" and OS=="netbsd"', {
++      'includes': ['config/archs/linux-armv4/asm/openssl.gypi'],
 +    }, 'target_arch=="x64" and OS=="netbsd"', {
 +      'includes': ['config/archs/BSD-x86_64/asm/openssl.gypi'],
      }, 'target_arch=="x64" and OS=="mac"', {
Index: pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl__no__asm.gypi
diff -u pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl__no__asm.gypi:1.1 pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl__no__asm.gypi:1.2
--- pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl__no__asm.gypi:1.1     Thu May  3 21:19:16 2018
+++ pkgsrc/lang/nodejs/patches/patch-deps_openssl_openssl__no__asm.gypi Thu Jan 10 13:02:41 2019
@@ -1,13 +1,15 @@
-$NetBSD: patch-deps_openssl_openssl__no__asm.gypi,v 1.1 2018/05/03 21:19:16 fhajny Exp $
+$NetBSD: patch-deps_openssl_openssl__no__asm.gypi,v 1.2 2019/01/10 13:02:41 ryoon Exp $
 
 Add support for NetBSD.
 
---- deps/openssl/openssl_no_asm.gypi.orig      2018-04-24 14:41:22.000000000 +0000
+--- deps/openssl/openssl_no_asm.gypi.orig      2018-12-10 21:19:04.000000000 +0000
 +++ deps/openssl/openssl_no_asm.gypi
-@@ -32,6 +32,8 @@
+@@ -32,6 +32,10 @@
        'includes': ['config/archs/linux-elf/no-asm/openssl.gypi'],
      }, 'target_arch=="x64" and OS=="freebsd"', {
        'includes': ['config/archs/BSD-x86_64/no-asm/openssl.gypi'],
++    }, 'target_arch=="arm" and OS=="netbsd"', {
++      'includes': ['config/archs/linux-armv4/no-asm/openssl.gypi'],
 +    }, 'target_arch=="x64" and OS=="netbsd"', {
 +      'includes': ['config/archs/BSD-x86_64/no-asm/openssl.gypi'],
      }, 'target_arch=="x64" and OS=="mac"', {

Added files:

Index: pkgsrc/lang/nodejs/patches/patch-deps_v8_src_arm_assembler-arm-inl.h
diff -u /dev/null pkgsrc/lang/nodejs/patches/patch-deps_v8_src_arm_assembler-arm-inl.h:1.1
--- /dev/null   Thu Jan 10 13:02:41 2019
+++ pkgsrc/lang/nodejs/patches/patch-deps_v8_src_arm_assembler-arm-inl.h        Thu Jan 10 13:02:41 2019
@@ -0,0 +1,13 @@
+$NetBSD: patch-deps_v8_src_arm_assembler-arm-inl.h,v 1.1 2019/01/10 13:02:41 ryoon Exp $
+
+--- deps/v8/src/arm/assembler-arm-inl.h.orig   2018-12-10 21:19:05.000000000 +0000
++++ deps/v8/src/arm/assembler-arm-inl.h
+@@ -386,7 +386,7 @@ void Assembler::set_target_address_at(Ad
+            IsOrrImmed(Memory::int32_at(pc + 2 * kInstrSize)) &&
+            IsOrrImmed(Memory::int32_at(pc + 3 * kInstrSize)));
+     uint32_t* instr_ptr = reinterpret_cast<uint32_t*>(pc);
+-    uint32_t immediate = reinterpret_cast<uint32_t>(target);
++    uint32_t immediate = static_cast<uint32_t>(target);
+     instr_ptr[0] = PatchShiftImm(instr_ptr[0], immediate & kImm8Mask);
+     instr_ptr[1] = PatchShiftImm(instr_ptr[1], immediate & (kImm8Mask << 8));
+     instr_ptr[2] = PatchShiftImm(instr_ptr[2], immediate & (kImm8Mask << 16));
Index: pkgsrc/lang/nodejs/patches/patch-deps_v8_src_arm_assembler-arm.cc
diff -u /dev/null pkgsrc/lang/nodejs/patches/patch-deps_v8_src_arm_assembler-arm.cc:1.1
--- /dev/null   Thu Jan 10 13:02:41 2019
+++ pkgsrc/lang/nodejs/patches/patch-deps_v8_src_arm_assembler-arm.cc   Thu Jan 10 13:02:41 2019
@@ -0,0 +1,22 @@
+$NetBSD: patch-deps_v8_src_arm_assembler-arm.cc,v 1.1 2019/01/10 13:02:41 ryoon Exp $
+
+--- deps/v8/src/arm/assembler-arm.cc.orig      2018-12-26 05:26:14.000000000 +0000
++++ deps/v8/src/arm/assembler-arm.cc
+@@ -343,7 +343,7 @@ Address RelocInfo::embedded_address() co
+ }
+ 
+ uint32_t RelocInfo::embedded_size() const {
+-  return reinterpret_cast<uint32_t>(
++  return static_cast<uint32_t>(
+       Assembler::target_address_at(pc_, constant_pool_));
+ }
+ 
+@@ -354,7 +354,7 @@ void RelocInfo::set_embedded_address(Add
+ 
+ void RelocInfo::set_embedded_size(uint32_t size, ICacheFlushMode flush_mode) {
+   Assembler::set_target_address_at(pc_, constant_pool_,
+-                                   reinterpret_cast<Address>(size), flush_mode);
++                                   static_cast<Address>(size), flush_mode);
+ }
+ 
+ void RelocInfo::set_js_to_wasm_address(Address address,