From owner-dev-commits-ports-all@freebsd.org Wed Apr 21 05:07:19 2021 Return-Path: Delivered-To: dev-commits-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 C5F545F6951; Wed, 21 Apr 2021 05:07:19 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FQ7pH5F7Tz4cmX; Wed, 21 Apr 2021 05:07:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A69C12055B; Wed, 21 Apr 2021 05:07:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13L57JZm091683; Wed, 21 Apr 2021 05:07:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13L57J0N091682; Wed, 21 Apr 2021 05:07:19 GMT (envelope-from git) Date: Wed, 21 Apr 2021 05:07:19 GMT Message-Id: <202104210507.13L57J0N091682@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: dee8b982f0b4 - main - www/node: unbreak patch on armv[67] after bc3d0937d0d2 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dee8b982f0b49fbf867518df9df56f9ace32705d Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Apr 2021 05:07:19 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=dee8b982f0b49fbf867518df9df56f9ace32705d commit dee8b982f0b49fbf867518df9df56f9ace32705d Author: Jan Beich AuthorDate: 2021-04-21 04:33:11 +0000 Commit: Jan Beich CommitDate: 2021-04-21 05:06:52 +0000 www/node: unbreak patch on armv[67] after bc3d0937d0d2 ===> Patching for node-16.0.0 ===> Applying extra patch /usr/ports/www/node/files/extra-patch-tools_v8__gypfiles_v8.gyp 1 out of 1 hunks failed--saving rejects to tools/v8_gypfiles/v8.gyp.rej ===> FAILED Applying extra patch /usr/ports/www/node/files/extra-patch-tools_v8__gypfiles_v8.gyp *** Error code 1 --- www/node/files/extra-patch-tools_v8__gypfiles_v8.gyp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/www/node/files/extra-patch-tools_v8__gypfiles_v8.gyp b/www/node/files/extra-patch-tools_v8__gypfiles_v8.gyp index 2bee41970fff..9749a96d68e5 100644 --- a/www/node/files/extra-patch-tools_v8__gypfiles_v8.gyp +++ b/www/node/files/extra-patch-tools_v8__gypfiles_v8.gyp @@ -1,11 +1,11 @@ ---- tools/v8_gypfiles/v8.gyp.orig 2020-04-25 08:50:20 UTC +--- tools/v8_gypfiles/v8.gyp.orig 2021-04-20 11:30:16 UTC +++ tools/v8_gypfiles/v8.gyp -@@ -805,7 +805,7 @@ +@@ -774,7 +774,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"]', { +- ['v8_current_cpu in ["mips", "mipsel", "mips64", "mips64el", "ppc", "arm", "riscv64"]', { ++ ['v8_current_cpu in ["mips", "mipsel", "mips64", "mips64el", "ppc", "riscv64"]', { 'link_settings': { 'libraries': ['-latomic', ], },