From nobody Mon Sep 05 12:42:30 2022 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 4MLp7p2g42z4cKbG; Mon, 5 Sep 2022 12:42:30 +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 4MLp7p2DXGz3frk; Mon, 5 Sep 2022 12:42:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662381750; 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=9MvrR24majAfcFLSFDzZ58IsFA8mhy/gw9j4mrn1ajo=; b=H+vX32LevdQAa/71Hj+yzu3+T+Rho6bBIB0HxE2bzCUxDAHYq85Y7Yxmf3SK4hGo2asm68 jWy8xKAvWt7dD7RLSt8OCgzhyUu49z17Zbwib4NFKGbkvgJqy199vpnPF9Zp9yNcNGj1D8 EKKH3VMdc0j4YR+F2ZB7EiMetW5AgBw6hkBfGrC5CqYGZ3b18MSo+t7zZRFsyMTd5phMp9 y6qQWjFE0+JmB1VBcYk4Pg/L6q9PPCPFk9sSEe1o/zpoIt8cosv/8pjOegxqrmhnb3UcC9 l63YZyEgd/kKeNDF0noDrYv5AXru/mGZentmIBCQ4+kVWXSV7ryFBgxnTGUk6g== 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 4MLp7p1H8rzqXR; Mon, 5 Sep 2022 12:42: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 285CgU4Y037476; Mon, 5 Sep 2022 12:42:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 285CgUar037471; Mon, 5 Sep 2022 12:42:30 GMT (envelope-from git) Date: Mon, 5 Sep 2022 12:42:30 GMT Message-Id: <202209051242.285CgUar037471@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 97eb3f01af91 - main - devel/pcc-libs: accept both x86_64 and amd64 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: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 97eb3f01af9176ff13ec178917ccf82a1d8da775 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662381750; 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=9MvrR24majAfcFLSFDzZ58IsFA8mhy/gw9j4mrn1ajo=; b=Tt4HG+ghuhuIFgnunUDBvVCVlZQmFMJaMcr1NZdSenHrajAcFVCVYgtisiiQDywzg0cGFg OS5snsN3ST+8XLfnhdSzV/qml/KmLK4Cy3Cg2t2veI+SlFxR6kvuEArEjOOk/ZZArtmkvU Tf0IR4xK15qFWXsHZ53B0Rp8AQfi7FKF9tNIiRZlOOxZiZSEArKpGc7Kl3o2pQjoXMgf3V C/bNPpqkoitSe393mAA+4ee/ZJP146aZOLYelBY7tyCXZlUOsI8q9eyAKo3ssKRLO+gOG9 mW0bFMUpC4bBSYZ01pFZITAz2pGcd8Q+pxpL3QCVdvstlv0XVceCWyZnnueP4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662381750; a=rsa-sha256; cv=none; b=sAK9T5FOI1MWCvbQb6hCDZl5YgcqTcW+tsfpAk6Qbj9Odo5S5PyUv5i4eIVvypfBCnXXbX SslWPpOdIVjWkWU9+FLlTtueucJHq6ZaHqLAZrFqX8fTDeZySVOIMrEKgO3g4dFtTSSaVc wFFBpszSOji2ixgTk3VlYZASBWXDwOU1HiOfL1lvjYhXQGEe1mneMVzuFee9kubHSVp5sP dRUy9F6Mkwzf6m2wLsTzUCwcywYHxNVkPqEagmpC5ePXScVkSj8W+xtMMG7tZRYpUwdF/b cnUFfmdw+MBQ78HxmxrDWvlxL7aEykaQIPj/rO3mSyEym9Pln1ofT6X5FCgILw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=97eb3f01af9176ff13ec178917ccf82a1d8da775 commit 97eb3f01af9176ff13ec178917ccf82a1d8da775 Author: Baptiste Daroussin AuthorDate: 2022-09-02 13:12:20 +0000 Commit: Baptiste Daroussin CommitDate: 2022-09-05 12:42:23 +0000 devel/pcc-libs: accept both x86_64 and amd64 In preparation for config.guess/config.sub --- devel/pcc-libs/Makefile | 10 +--------- devel/pcc-libs/files/patch-configure | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/devel/pcc-libs/Makefile b/devel/pcc-libs/Makefile index 2226016d5f6d..10f6c912659e 100644 --- a/devel/pcc-libs/Makefile +++ b/devel/pcc-libs/Makefile @@ -22,12 +22,4 @@ GNU_CONFIGURE= yes DATADIR= ${PREFIX}/lib/pcc PORTDATA= * -.include - -post-patch: -.if ${OPSYS} == FreeBSD - @${REINPLACE_CMD} -e '/targmach=amd64/s/x86_64/amd64/' \ - ${WRKSRC}/configure -.endif - -.include +.include diff --git a/devel/pcc-libs/files/patch-configure b/devel/pcc-libs/files/patch-configure new file mode 100644 index 000000000000..d58a99afb432 --- /dev/null +++ b/devel/pcc-libs/files/patch-configure @@ -0,0 +1,30 @@ +--- configure.orig 2014-12-06 10:06:59 UTC ++++ configure +@@ -1976,7 +1976,7 @@ case "$target_os" in + case "$target_cpu" in + i?86) targmach=i386 ;; + powerpc) targmach=powerpc endian=big ;; +- x86_64) targmach=amd64 ;; ++ amd64) targmach=amd64 ;; + esac + ;; + +@@ -1991,7 +1991,8 @@ case "$target_os" in + targos=freebsd + case "$target_cpu" in + i386) targmach=i386 ;; +- x86_64) targmach=amd64 ;; ++ amd64) targmach=amd64 ;; ++ x86_64|amd64) targmach=amd64 ;; + esac + ;; + +@@ -2000,7 +2001,7 @@ case "$target_os" in + case "$target_cpu" in + i?86) targmach=i386 ;; + powerpc*) targmach=powerpc endian=big ;; +- x86_64) targmach=amd64 ;; ++ amd64) targmach=amd64 ;; + esac + ;; +