Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 21 Apr 2021 05:07:19 GMT
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: dee8b982f0b4 - main - www/node: unbreak patch on armv[67] after bc3d0937d0d2
Message-ID:  <202104210507.13L57J0N091682@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=dee8b982f0b49fbf867518df9df56f9ace32705d

commit dee8b982f0b49fbf867518df9df56f9ace32705d
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2021-04-21 04:33:11 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
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', ],
            },



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104210507.13L57J0N091682>