svn commit: r533774 - in branches/2020Q2/www: node node/files node12 node12/files

[Fukang Chen]

Author: loader
Date: Sun May  3 13:00:46 2020
New Revision: 533774
URL: https://svnweb.freebsd.org/changeset/ports/533774

Log:
  MFH: r533741
  
  www/node, www/node12: Fix build on armv6 and armv7
  
  Reviewed by:	koobs, bhughes
  Approved by:	koobs (ports, mentor), bhughes (maintainer)
  Differential Revision:	https://reviews.freebsd.org/D24612
  
  Approved by:	ports-secteam (joneum)

Added:
  branches/2020Q2/www/node/files/extra-patch-tools_v8__gypfiles_v8.gyp
     - copied unchanged from r533741, head/www/node/files/extra-patch-tools_v8__gypfiles_v8.gyp
  branches/2020Q2/www/node12/files/extra-patch-tools_v8__gypfiles_v8.gyp
     - copied unchanged from r533741, head/www/node12/files/extra-patch-tools_v8__gypfiles_v8.gyp
Modified:
  branches/2020Q2/www/node/Makefile
  branches/2020Q2/www/node12/Makefile
Directory Properties:
  branches/2020Q2/   (props changed)

Modified: branches/2020Q2/www/node/Makefile
==============================================================================
--- branches/2020Q2/www/node/Makefile	Sun May  3 12:50:42 2020	(r533773)
+++ branches/2020Q2/www/node/Makefile	Sun May  3 13:00:46 2020	(r533774)
@@ -79,6 +79,10 @@ LIB_DEPENDS+=	libcares.so:dns/c-ares\
 EXTRA_PATCHES=		${PATCHDIR}/extra-patch-common.gypi
 .endif
 
+.if ${ARCH} == armv6 || ${ARCH} == armv7
+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-tools_v8__gypfiles_v8.gyp
+.endif
+
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200085
 BROKEN_SSL+=	base
 .endif

Copied: branches/2020Q2/www/node/files/extra-patch-tools_v8__gypfiles_v8.gyp (from r533741, head/www/node/files/extra-patch-tools_v8__gypfiles_v8.gyp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2020Q2/www/node/files/extra-patch-tools_v8__gypfiles_v8.gyp	Sun May  3 13:00:46 2020	(r533774, copy of r533741, head/www/node/files/extra-patch-tools_v8__gypfiles_v8.gyp)
@@ -0,0 +1,11 @@
+--- tools/v8_gypfiles/v8.gyp.orig	2020-04-25 08:50:20 UTC
++++ tools/v8_gypfiles/v8.gyp
+@@ -805,7 +805,7 @@
+         }],
+         # Platforms that don't have Compare-And-Swap (CAS) support need to link atomic library
+         # to implement atomic memory access
+-        ['v8_current_cpu in ["mips", "mipsel", "mips64", "mips64el", "ppc", "arm"]', {
++        ['v8_current_cpu in ["mips", "mipsel", "mips64", "mips64el", "ppc"]', {
+           'link_settings': {
+             'libraries': ['-latomic', ],
+           },

Modified: branches/2020Q2/www/node12/Makefile
==============================================================================
--- branches/2020Q2/www/node12/Makefile	Sun May  3 12:50:42 2020	(r533773)
+++ branches/2020Q2/www/node12/Makefile	Sun May  3 13:00:46 2020	(r533774)
@@ -80,6 +80,10 @@ LIB_DEPENDS+=	libcares.so:dns/c-ares\
 BROKEN_SSL+=	base
 .endif
 
+.if ${ARCH} == armv6 || ${ARCH} == armv7
+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-tools_v8__gypfiles_v8.gyp
+.endif
+
 .if ${PORT_OPTIONS:MBUNDLED_SSL} && ${ARCH} != amd64
 CONFIGURE_ARGS+=--openssl-no-asm
 .endif

Copied: branches/2020Q2/www/node12/files/extra-patch-tools_v8__gypfiles_v8.gyp (from r533741, head/www/node12/files/extra-patch-tools_v8__gypfiles_v8.gyp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2020Q2/www/node12/files/extra-patch-tools_v8__gypfiles_v8.gyp	Sun May  3 13:00:46 2020	(r533774, copy of r533741, head/www/node12/files/extra-patch-tools_v8__gypfiles_v8.gyp)
@@ -0,0 +1,11 @@
+--- tools/v8_gypfiles/v8.gyp.orig	2020-04-25 08:58:14 UTC
++++ tools/v8_gypfiles/v8.gyp
+@@ -809,7 +809,7 @@
+         }],
+         # Platforms that don't have Compare-And-Swap (CAS) support need to link atomic library
+         # to implement atomic memory access
+-        ['v8_current_cpu in ["mips", "mipsel", "mips64", "mips64el", "ppc", "arm"]', {
++        ['v8_current_cpu in ["mips", "mipsel", "mips64", "mips64el", "ppc"]', {
+           'link_settings': {
+             'libraries': ['-latomic', ],
+           },