From owner-svn-ports-head@freebsd.org Mon Feb 11 18:24:43 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C551A14DFF61; Mon, 11 Feb 2019 18:24:43 +0000 (UTC) (envelope-from bhughes@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 64863836C2; Mon, 11 Feb 2019 18:24:43 +0000 (UTC) (envelope-from bhughes@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3DCE83CDD; Mon, 11 Feb 2019 18:24:43 +0000 (UTC) (envelope-from bhughes@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1BIOhsY030514; Mon, 11 Feb 2019 18:24:43 GMT (envelope-from bhughes@FreeBSD.org) Received: (from bhughes@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1BIOgfk030507; Mon, 11 Feb 2019 18:24:42 GMT (envelope-from bhughes@FreeBSD.org) Message-Id: <201902111824.x1BIOgfk030507@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bhughes set sender to bhughes@FreeBSD.org using -f From: "Bradley T. Hughes" Date: Mon, 11 Feb 2019 18:24:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r492706 - in head/www: node node10 node6 node8 X-SVN-Group: ports-head X-SVN-Commit-Author: bhughes X-SVN-Commit-Paths: in head/www: node node10 node6 node8 X-SVN-Commit-Revision: 492706 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 64863836C2 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.95)[-0.948,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Feb 2019 18:24:44 -0000 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 - -.if ${ARCH} != amd64 && ${ARCH} != i386 +.if ${PORT_OPTIONS:MBUNDLED_SSL} && ${ARCH} != amd64 && ${ARCH} != i386 CONFIGURE_ARGS+=--openssl-no-asm .endif + +.include .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 - -.if ${ARCH} != amd64 && ${ARCH} != i386 +.if ${PORT_OPTIONS:MBUNDLED_SSL} && ${ARCH} != amd64 && ${ARCH} != i386 CONFIGURE_ARGS+=--openssl-no-asm .endif + +.include .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 - -.if ${ARCH} == armv6 || ${ARCH} == armv7 +.if ${PORT_OPTIONS:MBUNDLED_SSL} && ${ARCH} != amd64 && ${ARCH} != i386 CONFIGURE_ARGS+=--openssl-no-asm .endif + +.include .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 +.include -.if ${ARCH} == armv6 || ${ARCH} == armv7 +.if ${PORT_OPTIONS:MBUNDLED_SSL} && ${ARCH} != amd64 && ${ARCH} != i386 CONFIGURE_ARGS+=--openssl-no-asm .endif + +.include .if ${CHOSEN_COMPILER_TYPE} == gcc # GCC does not expose std::snprintf() without this define