Re: pkg/53758: lang/nodejs build error

[Izumi Tsutsui <tsutsui%ceres.dti.ne.jp@localhost>]

The following reply was made to PR pkg/53758; it has been noted by GNATS.

From: Izumi Tsutsui <tsutsui%ceres.dti.ne.jp@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: tsutsui%ceres.dti.ne.jp@localhost
Subject: Re: pkg/53758: lang/nodejs build error
Date: Mon, 24 Dec 2018 14:24:32 +0900

 I wrote:
 > This patch is for pkgsrc-2018Q3 (i.e. nodejs-10.11.0, while the latest
 > pkgsrc-current has 10.14.0)
 
 Here is a patch for pkgsrc HEAD:
 
 ---
 ? patches/patch-deps_openssl_config_archs_linux-elf_asm_openssl-cl.gypi
 Index: Makefile
 ===================================================================
 RCS file: /cvsroot/pkgsrc/lang/nodejs/Makefile,v
 retrieving revision 1.150
 diff -u -p -d -r1.150 Makefile
 --- Makefile	15 Dec 2018 17:32:38 -0000	1.150
 +++ Makefile	24 Dec 2018 05:14:31 -0000
 @@ -24,6 +24,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"
 Index: distinfo
 ===================================================================
 RCS file: /cvsroot/pkgsrc/lang/nodejs/distinfo,v
 retrieving revision 1.140
 diff -u -p -d -r1.140 distinfo
 --- distinfo	15 Dec 2018 17:32:38 -0000	1.140
 +++ distinfo	24 Dec 2018 05:14:31 -0000
 @@ -6,7 +6,8 @@ SHA512 (node-v10.14.2.tar.gz) = 72e78f88
  Size (node-v10.14.2.tar.gz) = 36299908 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_archs_linux-elf_asm_openssl-cl.gypi) = f92f5547728cf67de5ccfd652f23cc4ab8f5b207
 +SHA1 (patch-deps_openssl_config_opensslconf__asm.h) = f60ebbb92b804c1d2625c24c73c580a6da7aa046
  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
 Index: patches/patch-deps_openssl_config_opensslconf__asm.h
 ===================================================================
 RCS file: /cvsroot/pkgsrc/lang/nodejs/patches/patch-deps_openssl_config_opensslconf__asm.h,v
 retrieving revision 1.1
 diff -u -p -d -r1.1 patch-deps_openssl_config_opensslconf__asm.h
 --- patches/patch-deps_openssl_config_opensslconf__asm.h	3 May 2018 21:19:16 -0000	1.1
 +++ patches/patch-deps_openssl_config_opensslconf__asm.h	24 Dec 2018 05:14:31 -0000
 @@ -2,15 +2,14 @@ $NetBSD: patch-deps_openssl_config_opens
  
  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
 -@@ -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"
 --- /dev/null	2018-12-24 13:59:53.779148582 +0900
 +++ patches/patch-deps_openssl_config_archs_linux-elf_asm_openssl-cl.gypi	2018-12-24 13:44:34.882408263 +0900
 @@ -0,0 +1,23 @@
 +$NetBSD$
 +
 +--- 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',
 
 
 ---
 
 https://gist.github.com/tsutsui/de2b274a1fbf9d3708d6d56a7c7986ba
 
 ---
 Izumi Tsutsui