Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 21 Apr 2023 15:26:06 GMT
From:      Piotr Kubaj <pkubaj@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: f8131093e99a - main - www/node18: fix patching on powerpc64*
Message-ID:  <202304211526.33LFQ613033788@gitrepo.freebsd.org>

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

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

commit f8131093e99a950cef10b026d83f233b792935c4
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2023-04-21 15:25:16 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2023-04-21 15:26:06 +0000

    www/node18: fix patching on powerpc64*
---
 www/node18/files/extra-patch-common.gypi | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/www/node18/files/extra-patch-common.gypi b/www/node18/files/extra-patch-common.gypi
index 8e817a2959c9..02db35b1a46c 100644
--- a/www/node18/files/extra-patch-common.gypi
+++ b/www/node18/files/extra-patch-common.gypi
@@ -1,13 +1,11 @@
---- common.gypi.orig	2019-10-01 15:32:40.000000000 +0200
-+++ common.gypi	2019-10-16 12:47:09.236138000 +0200
-@@ -390,8 +390,8 @@
+--- common.gypi.orig	2023-04-12 04:09:10 UTC
++++ common.gypi
+@@ -426,7 +426,7 @@
              'ldflags': [ '-m32' ],
            }],
-           [ 'target_arch=="ppc64" and OS!="aix"', {
+           [ 'target_arch=="ppc64" and OS not in "aix os400"', {
 -            'cflags': [ '-m64', '-mminimal-toc' ],
--            'ldflags': [ '-m64' ],
 +            'cflags': [ '-m64' ],
-+            'ldflags': [ '-m64' ],
+             'ldflags': [ '-m64' ],
            }],
-           [ 'target_arch=="s390x"', {
-             'cflags': [ '-m64', '-march=z196' ],
+           [ 'target_arch=="s390x" and OS=="linux"', {



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