From owner-svn-ports-all@freebsd.org Sun May 3 13:00:48 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 27FAA2DD0E3; Sun, 3 May 2020 13:00:48 +0000 (UTC) (envelope-from loader@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 49FR1X0K7xz4f2c; Sun, 3 May 2020 13:00:48 +0000 (UTC) (envelope-from loader@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 0657DB4F5; Sun, 3 May 2020 13:00:48 +0000 (UTC) (envelope-from loader@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 043D0lZd072744; Sun, 3 May 2020 13:00:47 GMT (envelope-from loader@FreeBSD.org) Received: (from loader@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 043D0ln6072161; Sun, 3 May 2020 13:00:47 GMT (envelope-from loader@FreeBSD.org) Message-Id: <202005031300.043D0ln6072161@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: loader set sender to loader@FreeBSD.org using -f From: Fukang Chen Date: Sun, 3 May 2020 13:00:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r533774 - in branches/2020Q2/www: node node/files node12 node12/files X-SVN-Group: ports-branches X-SVN-Commit-Author: loader X-SVN-Commit-Paths: in branches/2020Q2/www: node node/files node12 node12/files X-SVN-Commit-Revision: 533774 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 May 2020 13:00:48 -0000 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', ], + },