From nobody Mon Apr 24 20:34:30 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 4Q4xgr4XdGz47KM8; Mon, 24 Apr 2023 20:34:32 +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 4Q4xgq44yRz3jrw; Mon, 24 Apr 2023 20:34:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682368471; 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=2wlwH6IPflQe1/z2quUvSRUoi965oe1LCqROt6LoO8g=; b=wULbL2nPYuapkjLsihqcJ/13Mp9cQNPtlC6fIePRex9dkFGjiiMlpNKgsdWpiByNSHOLJc ptIAdYOyf6RDabk8C9ytemf2DQWrN2Pum0ikVCrrliS+3Y7aPfgQ+h3Zz1LP4Pzw+Le9WY WnSE1xCiqYgxHUs1WB6WwNHPqtyeVF3BKmFAvsOmhHxc5uin48kRf0X6pK+8S7zrSEZFi2 3DUlnCGOU/ODE7kJsuzNvg1NEDdILquWXc/lhK2wYNd7kN5+iSb/umB/W2tF5PsnMroPEy 5Xk28IZK7GtJD3riATJTTb/BzxLEso/l/BwMbXOxqHhFx1MTAv7pzgT3RVUKpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682368471; 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=2wlwH6IPflQe1/z2quUvSRUoi965oe1LCqROt6LoO8g=; b=JsUE5bqRlNNeboRv/nwIVUGlSDKfm3R2bzt9CAIlp3DEjOp8YkJsee9qOvl8x0g/fW6ioU sRVd6GyH36aOktCNcodQCoe2zfDjLpYWoSjvTdbQlzAtHUd3GS7YW274HtKuObYilUPUBO NzIl2eh30gE9OgPgHt6K9FOp/SJE8tUiQNB9GxpiF1TQCVaYeof6l5c8s4ostju0auM6g0 vgnauTrjbOEVWpL3G/PC5fgUISMCzkDvja6592YZhoZPZp8YxzQ8AeKj36e0Zvxxv3Sxus jtle75S+tvQrHFA6M50NxS21gMMSvl2tJS6Id1/qabhuDDJQ/FviIMsm4eDpsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682368471; a=rsa-sha256; cv=none; b=MVlKh9KiIhxLZj2CfBsEZQhrfg9mHYVcELDuOmhdUKuJquSDh6l8ter0ebZ1oTPcMW04ba YpOAEu1G7vLsbe7Xd1aEvOvLB2gujUUDRGj9OgqF6RI5c5U8QDaMEebC0Fpyx9MB+IOQ/o Qo31FJNs87rw2+NtiKaPcxBrQiPnPvMJOtwSLicVwZexFFT8vUoESPHRgeOVk87vzcgf04 D67bzGptdjPfG51rKtR+aF6Tb5AHlnJMoPhcsxTsWU+GOs8R+olATQidAQRIjoS3pPVyPJ LD21Ooswn4VKwdTNCPI95TnDDVx4u3oUq6GWwxaA2pcLBFB0Oyl23LGv5kUqlw== 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 4Q4xgp3qgCzftS; Mon, 24 Apr 2023 20:34:30 +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 33OKYUOV062002; Mon, 24 Apr 2023 20:34:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33OKYUer062001; Mon, 24 Apr 2023 20:34:30 GMT (envelope-from git) Date: Mon, 24 Apr 2023 20:34:30 GMT Message-Id: <202304242034.33OKYUer062001@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: 7c7c83de7119 - main - www/node20: 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: 7c7c83de7119b8de58fac4ce87a13d0c0cd17319 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=7c7c83de7119b8de58fac4ce87a13d0c0cd17319 commit 7c7c83de7119b8de58fac4ce87a13d0c0cd17319 Author: Piotr Kubaj AuthorDate: 2023-04-24 18:24:36 +0000 Commit: Piotr Kubaj CommitDate: 2023-04-24 20:34:01 +0000 www/node20: fix patching on powerpc64* --- www/node20/files/extra-patch-common.gypi | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/www/node20/files/extra-patch-common.gypi b/www/node20/files/extra-patch-common.gypi index 8e817a2959c9..02db35b1a46c 100644 --- a/www/node20/files/extra-patch-common.gypi +++ b/www/node20/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"', {