svn commit: r492706 - in head/www: node node10 node6 node8

[Bradley T. Hughes]

Author: bhughes
Date: Mon Feb 11 18:24:42 2019
New Revision: 492706
URL: https://svnweb.freebsd.org/changeset/ports/492706

Log:
  www/node*: fix build on non-amd64/-i386 when BUNDLED_SSL is unset
  
  The --openssl-no-asm configure option should only be set
  when BUNDLED_SSL is enabled.
  
  PR:		235311
  Reported by:	jbeich
  Sponsored by:	Miles AS

Modified:
  head/www/node/Makefile
  head/www/node10/Makefile
  head/www/node6/Makefile
  head/www/node8/Makefile

Modified: head/www/node/Makefile
==============================================================================
--- head/www/node/Makefile	Mon Feb 11 17:57:55 2019	(r492705)
+++ head/www/node/Makefile	Mon Feb 11 18:24:42 2019	(r492706)
@@ -72,11 +72,11 @@ LIB_DEPENDS+=	libcares.so:dns/c-ares\
 BROKEN_SSL+=	base
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} != amd64 && ${ARCH} != i386
+.if ${PORT_OPTIONS:MBUNDLED_SSL} && ${ARCH} != amd64 && ${ARCH} != i386
 CONFIGURE_ARGS+=--openssl-no-asm
 .endif
+
+.include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 # GCC does not expose std::snprintf() without this define

Modified: head/www/node10/Makefile
==============================================================================
--- head/www/node10/Makefile	Mon Feb 11 17:57:55 2019	(r492705)
+++ head/www/node10/Makefile	Mon Feb 11 18:24:42 2019	(r492706)
@@ -73,11 +73,11 @@ LIB_DEPENDS+=	libcares.so:dns/c-ares\
 BROKEN_SSL+=	base
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} != amd64 && ${ARCH} != i386
+.if ${PORT_OPTIONS:MBUNDLED_SSL} && ${ARCH} != amd64 && ${ARCH} != i386
 CONFIGURE_ARGS+=--openssl-no-asm
 .endif
+
+.include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 # GCC does not expose std::snprintf() without this define

Modified: head/www/node6/Makefile
==============================================================================
--- head/www/node6/Makefile	Mon Feb 11 17:57:55 2019	(r492705)
+++ head/www/node6/Makefile	Mon Feb 11 18:24:42 2019	(r492706)
@@ -71,11 +71,11 @@ LIB_DEPENDS+=	libcares.so:dns/c-ares\
 BROKEN_SSL+=	base
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == armv6 || ${ARCH} == armv7
+.if ${PORT_OPTIONS:MBUNDLED_SSL} && ${ARCH} != amd64 && ${ARCH} != i386
 CONFIGURE_ARGS+=--openssl-no-asm
 .endif
+
+.include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 # GCC does not expose std::snprintf() without this define

Modified: head/www/node8/Makefile
==============================================================================
--- head/www/node8/Makefile	Mon Feb 11 17:57:55 2019	(r492705)
+++ head/www/node8/Makefile	Mon Feb 11 18:24:42 2019	(r492706)
@@ -65,11 +65,13 @@ LIB_DEPENDS+=	libcares.so:dns/c-ares\
 		libuv.so:devel/libuv \
 		libnghttp2.so:www/libnghttp2
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if ${ARCH} == armv6 || ${ARCH} == armv7
+.if ${PORT_OPTIONS:MBUNDLED_SSL} && ${ARCH} != amd64 && ${ARCH} != i386
 CONFIGURE_ARGS+=--openssl-no-asm
 .endif
+
+.include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 # GCC does not expose std::snprintf() without this define