From nobody Fri Apr 21 15:26:06 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q2yzM098fz46XWN; Fri, 21 Apr 2023 15:26:07 +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 4Q2yzL6TF4z4Px2; Fri, 21 Apr 2023 15:26:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682090766; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1ttp7uXKO35kRWYDzSh0rd5TUzEyPrM3q6sSkaVumHY=; b=OilpjZSN52Bma6/citVgC2LArux/jaO7pk9ORO4TbweIcHYzoy7cCdkdDZBy+vCDzejIrc oBNaJAlkWC+KmQnRHfBfiENlVlZtsSlWrnoomDMV/wPHcVseyYMQz+t9oKX1exZmuhrRii BJbnF9pt/t9BkG0BaW5whXtJ4aNllZ739j2ZyfbhdGEtnx9YiakVpfCVjdH7+LCctVFlWJ ViMxbor0Cjxcoy2Ue/sqNMnf/cIWCyi+a9ElMS3dbeSiQEsKnsP3dTacr8FYbG8hPtWqOk sEDykbgzTxr8b7OQYstoNS5hiBNMif7jTVZBu5YF4ojL8ypETUXDIXS8WCCCGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682090766; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1ttp7uXKO35kRWYDzSh0rd5TUzEyPrM3q6sSkaVumHY=; b=b8URr2+ieIEaTGoegUADzVh81XkIy2lv/qXiEthvNZSCjmUPOYkBUNnTag5coktDhzytLK q7I54L04/EV19zH/p4ysrNbRy04ytGwjcRC7KNFEW6+xhpEkt/Odl2ttRWU4zLtDqKGVju uZUwU79cOhBeM1NmU7szbIbXgM1xz445E0Y2zT/UX20ks7VB+wZJVHa0FdHh4erGRFhTGn /ky3njuqo/NgQgNG924x7uMGb/LyUxnH04exWhGcDsooCsgmq5rDgJqSTLISZf17+iAJ+u sSWXZOSdTfsJHdD+ByHQAg2BCQ7Jb4yO/66oplW82bgGxGhifQ1b5sHrNRfr1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682090766; a=rsa-sha256; cv=none; b=wi3vv0+fdzaeva8HeqJR/EG4R5tNmJQq4eWJssBmCTHNgepPXl8ajWWgHjPFFtQLOzo9cm Wbl5jG9vzz/LYn4oyLvnJm3s4xAy0Ttno8z0yRYXZSC6ftIfkCc7aMFeLpyCfZtZm5LB4T 7EuWk1iUQZO60+RLvhneEovHfapkRTVw08kZPthMMoy+gcMg94clXdaY3+IE9hIC4evph3 vEbznbSjwzEgVdJPvAAHd/LlRNxDi+/zbQKUQOUJmLUUxzGsaPOV3PQOEb/pwKZpC/30MJ OIvGv08TxhfwgpnygSytYjpC115/y3Mqzoqnt1edwyIJogB5B0BqIIhhRqGuXw== 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 4Q2yzL5YQPzQ5s; Fri, 21 Apr 2023 15:26:06 +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 33LFQ6Nd033789; Fri, 21 Apr 2023 15:26:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33LFQ613033788; Fri, 21 Apr 2023 15:26:06 GMT (envelope-from git) Date: Fri, 21 Apr 2023 15:26:06 GMT Message-Id: <202304211526.33LFQ613033788@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: f8131093e99a - main - www/node18: fix patching on powerpc64* List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f8131093e99a950cef10b026d83f233b792935c4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=f8131093e99a950cef10b026d83f233b792935c4 commit f8131093e99a950cef10b026d83f233b792935c4 Author: Piotr Kubaj AuthorDate: 2023-04-21 15:25:16 +0000 Commit: Piotr Kubaj 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"', {