Fix build under NetBSD/i386 8.0, based on PR pkg/53758

4 files changed, 38 insertions, 8 deletions

diff --git a/lang/nodejs/Makefile b/lang/nodejs/Makefile
index 81ac00a286e..e6a23c9fdbb 100644
--- a/lang/nodejs/Makefile
+++ b/lang/nodejs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.151 2019/01/08 14:51:10 adam Exp $
+# $NetBSD: Makefile,v 1.152 2019/01/21 11:00:45 ryoon Exp $
 
 DISTNAME=	node-v10.15.0
 
@@ -23,6 +23,13 @@ CONFIGURE_ARGS+=	--with-intl=system-icu
 
 CHECK_PORTABILITY_SKIP+=	deps/openssl/openssl/.travis-create-release.sh
 
+.if ${MACHINE_ARCH} == "i386"
+# 64 bit atomic ops are required
+CXXFLAGS+=	-march=i586
+# required for SSE2 code under i386.
+CXXFLAGS+=	-mstackrealign
+.endif
+
 .include "options.mk"
 
 .include "../../lang/nodejs/Makefile.common"
diff --git a/lang/nodejs/distinfo b/lang/nodejs/distinfo
index a740098b13c..cba38d13784 100644
--- a/lang/nodejs/distinfo
+++ b/lang/nodejs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.142 2019/01/10 13:02:41 ryoon Exp $
+$NetBSD: distinfo,v 1.143 2019/01/21 11:00:45 ryoon Exp $
 
 SHA1 (node-v10.15.0.tar.gz) = 82d9507bed032ad5ed07881fbb87db4e5734a996
 RMD160 (node-v10.15.0.tar.gz) = bc81fcc79a316ec00db5dfcfcad0666d51379d5d
@@ -6,7 +6,8 @@ SHA512 (node-v10.15.0.tar.gz) = ad8ecc8957afba8d5ba49bebe5dfb5bd656c492bf9ea7cdd
 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) = 62a05829240a504dae3c04b0f4ec1428810d456b
+SHA1 (patch-deps_openssl_config_archs_linux-elf_asm_openssl-cl.gypi) = f92f5547728cf67de5ccfd652f23cc4ab8f5b207
+SHA1 (patch-deps_openssl_config_opensslconf__asm.h) = c43c7732164a107d7a294cac040708970ef0a212
 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
diff --git a/lang/nodejs/patches/patch-deps_openssl_config_archs_linux-elf_asm_openssl-cl.gypi b/lang/nodejs/patches/patch-deps_openssl_config_archs_linux-elf_asm_openssl-cl.gypi
new file mode 100644
index 00000000000..9a1a3a8cf6a
--- /dev/null
+++ b/lang/nodejs/patches/patch-deps_openssl_config_archs_linux-elf_asm_openssl-cl.gypi
@@ -0,0 +1,23 @@
+$NetBSD: patch-deps_openssl_config_archs_linux-elf_asm_openssl-cl.gypi,v 1.1 2019/01/21 11:00:45 ryoon Exp $
+
+--- deps/openssl/config/archs/linux-elf/asm/openssl-cl.gypi.orig	2018-09-20 07:28:30.000000000 +0000
++++ deps/openssl/config/archs/linux-elf/asm/openssl-cl.gypi
+@@ -28,8 +28,16 @@
+     'openssl_cflags_linux-elf': [
+       '-Wall -O3 -pthread -DL_ENDIAN -fomit-frame-pointer',
+     ],
+-    'openssl_ex_libs_linux-elf': [
+-      '-ldl -pthread',
++    'conditions': [
++      ['OS=="linux"', {
++        'openssl_ex_libs_linux-elf': [
++          '-ldl -pthread',
++        ],
++      }, {
++        'openssl_ex_libs_linux-elf': [
++          '',
++        ],
++      }],
+     ],
+     'openssl_cli_srcs_linux-elf': [
+       'openssl/apps/app_rand.c',
diff --git a/lang/nodejs/patches/patch-deps_openssl_config_opensslconf__asm.h b/lang/nodejs/patches/patch-deps_openssl_config_opensslconf__asm.h
index 0593c2ccc37..8afa29601db 100644
--- a/lang/nodejs/patches/patch-deps_openssl_config_opensslconf__asm.h
+++ b/lang/nodejs/patches/patch-deps_openssl_config_opensslconf__asm.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-deps_openssl_config_opensslconf__asm.h,v 1.2 2019/01/10 13:02:41 ryoon Exp $
+$NetBSD: patch-deps_openssl_config_opensslconf__asm.h,v 1.3 2019/01/21 11:00:45 ryoon Exp $
 
 Add support for NetBSD.
 
---- deps/openssl/config/opensslconf_asm.h.orig	2018-12-10 21:19:03.000000000 +0000
+--- deps/openssl/config/opensslconf_asm.h.orig	2018-12-26 05:26:13.000000000 +0000
 +++ deps/openssl/config/opensslconf_asm.h
 @@ -96,7 +96,7 @@
  # include "./archs/linux-x32/asm/include/openssl/opensslconf.h"
@@ -13,13 +13,12 @@ Add support for NetBSD.
  # 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 @@
+@@ -108,9 +108,7 @@
  # include "./archs/VC-WIN32/asm/include/openssl/opensslconf.h"
  #elif defined(_WIN32) && defined(_M_X64)
  # include "./archs/VC-WIN64A/asm/include/openssl/opensslconf.h"
 -#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__)
-+#elif (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)) && defined(__i386__)
- # include "./archs/BSD-x86/asm/include/openssl/opensslconf.h"
+-# include "./archs/BSD-x86/asm/include/openssl/opensslconf.h"
 -#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__x86_64__)
 +#elif (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)) && defined(__x86_64__)
  # include "./archs/BSD-x86_64/asm/include/openssl/opensslconf.h"