From nobody Mon Jun 19 15:20:27 2023 X-Original-To: dev-commits-ports-all@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 4QlD3b44SCz4fvh3; Mon, 19 Jun 2023 15:20:27 +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 4QlD3b3Rp5z4GgV; Mon, 19 Jun 2023 15:20:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687188027; 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=CBng7e7XC5GB9kADA6JYiHbTcVZQRx6vJ55jkA2Gpys=; b=FxP4i/MLHJN4o5Q7WHIs75SFeZGFnOMqbU3WIPMx3Yb7T81tJUuLvQq1CZwIFrNp27Gd2v I3SlbyY+0I8wO7ow2lcOXfaN2JqlLsFS77cG1UZ3uynowuPt4TPJ6dUYuDmj81+YP4V1SI TxrOsk1k2lwxOZkcyUwPVkcycCrcNx/8BENOneRA8x1E8JmRXlg1+b+jNUINTXp2kwxOT8 u8wIQewINPGGz1qzkQuR4r9sdHnezB0CT93Ocd13D4BZi3CVQcZw7gVu2fnU8gL2fHcZ35 xfO5QEwwd26Gjmf4bk871I/y6cUdEjEcgPV6S8LXY2DwrccU7sltXZSXJvmlDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687188027; 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=CBng7e7XC5GB9kADA6JYiHbTcVZQRx6vJ55jkA2Gpys=; b=esYaIcUBJrnhywrsid3r+nWKF470VFNuV9QBBZMjUcvk9HYeP8DWNYrqfCaGLEqNoOGOiC JOSxYv/kMFTL0MAiu7BJF9A/p243vpoqAzPXCT9puMeAJ+vMcp6joWAJNdB7IO7JlkM8ng pWJS/mJ/bvQjpexKcfCDneTf/0z+5LuXbnq6XaVc7tBLGFLo9PaB4fG7YmryD2Hrtk2NgI N2MV9xECn31qzu6q3/inCrNNmcaMxly69Moh8HF4bHgpZ2RNZHRIQL9p+iM5k+0uJRCa3R /Vmfna2Vhw6VYezZD+Lt8gaxR2lM+uGVAUPlc3kxVyRzZqrctJzyWrUM3zRAmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687188027; a=rsa-sha256; cv=none; b=cUNTgNdFrmbRoDJdjd2GWsDwVP/pMfPwAPKxZ4RlhcLRGsbHmVujNHlToIhRLswdE4bazT a9ZfiG6DPmTy3RFd3EfihvLQbVKmPTy8sdXWVjnbKMgCQez3zZ/O4UUDoMKYXvsOIbWgdB DjWIx7EL9vIVoYr/9CQjBmoZBhNlene6TdH4uXGu++fN/r7XoMCZjVTlo7/zFcrXWj4bTm CT2lRm8KD/P8AXuNkH0bvQNOtmyntew7KghVHeeNtO6ajuzpDLJVc7CRrT77DMQ1LNQkb4 Xg+VzpaWvsjlRX7L3VptGKu4VtRBHSK0zEys/+rs5oM3Nh2GMu2zpddWtDQlOA== 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 4QlD3b2Wk4zMpJ; Mon, 19 Jun 2023 15:20:27 +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 35JFKRoS059456; Mon, 19 Jun 2023 15:20:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35JFKRAw059455; Mon, 19 Jun 2023 15:20:27 GMT (envelope-from git) Date: Mon, 19 Jun 2023 15:20:27 GMT Message-Id: <202306191520.35JFKRAw059455@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: 91117ec83f96 - main - lang/gcc*: fix build with CPUTYPE?=g[3-5] List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 91117ec83f966fad5e943737928abe956cd49720 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=91117ec83f966fad5e943737928abe956cd49720 commit 91117ec83f966fad5e943737928abe956cd49720 Author: Piotr Kubaj AuthorDate: 2023-06-19 15:19:22 +0000 Commit: Piotr Kubaj CommitDate: 2023-06-19 15:19:22 +0000 lang/gcc*: fix build with CPUTYPE?=g[3-5] GCC does not accept -mcpu=g4, but does accept -mcpu=G4. --- lang/gcc10/Makefile | 5 +++++ lang/gcc11-devel/Makefile | 5 +++++ lang/gcc11/Makefile | 5 +++++ lang/gcc12-devel/Makefile | 5 +++++ lang/gcc13-devel/Makefile | 5 +++++ lang/gcc13/Makefile | 5 +++++ lang/gcc14-devel/Makefile | 5 +++++ lang/gcc8/Makefile | 5 +++++ lang/gcc9/Makefile | 5 +++++ 9 files changed, 45 insertions(+) diff --git a/lang/gcc10/Makefile b/lang/gcc10/Makefile index a8fa53b04cba..5c31b203f913 100644 --- a/lang/gcc10/Makefile +++ b/lang/gcc10/Makefile @@ -52,6 +52,11 @@ MULTILIB_CONFIGURE_ENABLE= multilib CONFIGURE_ARGS+= --disable-multilib .endif +.if defined(CPUTYPE) && ${CPUTYPE:Mg[3-5]} +CFLAGS:= ${CFLAGS:S/mcpu=g/mcpu=G/} +CXXFLAGS:= ${CFLAGS:S/mcpu=g/mcpu=G/} +.endif + .include .if ${ARCH} == amd64 diff --git a/lang/gcc11-devel/Makefile b/lang/gcc11-devel/Makefile index 65a99716701d..9658fa8d4eaa 100644 --- a/lang/gcc11-devel/Makefile +++ b/lang/gcc11-devel/Makefile @@ -66,6 +66,11 @@ MULTILIB_CONFIGURE_ENABLE= multilib CONFIGURE_ARGS+= --disable-multilib .endif +.if defined(CPUTYPE) && ${CPUTYPE:Mg[3-5]} +CFLAGS:= ${CFLAGS:S/mcpu=g/mcpu=G/} +CXXFLAGS:= ${CFLAGS:S/mcpu=g/mcpu=G/} +.endif + .include .if ${ARCH} == amd64 diff --git a/lang/gcc11/Makefile b/lang/gcc11/Makefile index 125f50646178..9eba89a44d51 100644 --- a/lang/gcc11/Makefile +++ b/lang/gcc11/Makefile @@ -60,6 +60,11 @@ MULTILIB_CONFIGURE_ENABLE= multilib CONFIGURE_ARGS+= --disable-multilib .endif +.if defined(CPUTYPE) && ${CPUTYPE:Mg[3-5]} +CFLAGS:= ${CFLAGS:S/mcpu=g/mcpu=G/} +CXXFLAGS:= ${CFLAGS:S/mcpu=g/mcpu=G/} +.endif + .include # Extraction fails with poudriere on aarch64 for GCC 11. diff --git a/lang/gcc12-devel/Makefile b/lang/gcc12-devel/Makefile index 0a5f1068d62f..6b395959012d 100644 --- a/lang/gcc12-devel/Makefile +++ b/lang/gcc12-devel/Makefile @@ -66,6 +66,11 @@ MULTILIB_CONFIGURE_ENABLE= multilib CONFIGURE_ARGS+= --disable-multilib .endif +.if defined(CPUTYPE) && ${CPUTYPE:Mg[3-5]} +CFLAGS:= ${CFLAGS:S/mcpu=g/mcpu=G/} +CXXFLAGS:= ${CFLAGS:S/mcpu=g/mcpu=G/} +.endif + .include .if ${ARCH} == amd64 diff --git a/lang/gcc13-devel/Makefile b/lang/gcc13-devel/Makefile index b7c7a0802fc4..1fb4b5737b9c 100644 --- a/lang/gcc13-devel/Makefile +++ b/lang/gcc13-devel/Makefile @@ -66,6 +66,11 @@ MULTILIB_CONFIGURE_ENABLE= multilib CONFIGURE_ARGS+= --disable-multilib .endif +.if defined(CPUTYPE) && ${CPUTYPE:Mg[3-5]} +CFLAGS:= ${CFLAGS:S/mcpu=g/mcpu=G/} +CXXFLAGS:= ${CFLAGS:S/mcpu=g/mcpu=G/} +.endif + .include .if ${ARCH} == amd64 diff --git a/lang/gcc13/Makefile b/lang/gcc13/Makefile index 307fd5954450..4a0babeb0e5e 100644 --- a/lang/gcc13/Makefile +++ b/lang/gcc13/Makefile @@ -61,6 +61,11 @@ MULTILIB_CONFIGURE_ENABLE= multilib CONFIGURE_ARGS+= --disable-multilib .endif +.if defined(CPUTYPE) && ${CPUTYPE:Mg[3-5]} +CFLAGS:= ${CFLAGS:S/mcpu=g/mcpu=G/} +CXXFLAGS:= ${CFLAGS:S/mcpu=g/mcpu=G/} +.endif + .include .if ${ARCH} == amd64 diff --git a/lang/gcc14-devel/Makefile b/lang/gcc14-devel/Makefile index c1d06311a1fa..a53e54ff7d3c 100644 --- a/lang/gcc14-devel/Makefile +++ b/lang/gcc14-devel/Makefile @@ -64,6 +64,11 @@ MULTILIB_CONFIGURE_ENABLE= multilib CONFIGURE_ARGS+= --disable-multilib .endif +.if defined(CPUTYPE) && ${CPUTYPE:Mg[3-5]} +CFLAGS:= ${CFLAGS:S/mcpu=g/mcpu=G/} +CXXFLAGS:= ${CFLAGS:S/mcpu=g/mcpu=G/} +.endif + .include .if ${ARCH} == amd64 diff --git a/lang/gcc8/Makefile b/lang/gcc8/Makefile index 6fb128eac336..ff19bc167522 100644 --- a/lang/gcc8/Makefile +++ b/lang/gcc8/Makefile @@ -50,6 +50,11 @@ MULTILIB_CONFIGURE_ENABLE= multilib CONFIGURE_ARGS+= --disable-multilib .endif +.if defined(CPUTYPE) && ${CPUTYPE:Mg[3-5]} +CFLAGS:= ${CFLAGS:S/mcpu=g/mcpu=G/} +CXXFLAGS:= ${CFLAGS:S/mcpu=g/mcpu=G/} +.endif + .include .if ${ARCH} == amd64 diff --git a/lang/gcc9/Makefile b/lang/gcc9/Makefile index 33d32ffe74f5..51cc78ca41d7 100644 --- a/lang/gcc9/Makefile +++ b/lang/gcc9/Makefile @@ -54,6 +54,11 @@ MULTILIB_CONFIGURE_ENABLE= multilib CONFIGURE_ARGS+= --disable-multilib .endif +.if defined(CPUTYPE) && ${CPUTYPE:Mg[3-5]} +CFLAGS:= ${CFLAGS:S/mcpu=g/mcpu=G/} +CXXFLAGS:= ${CFLAGS:S/mcpu=g/mcpu=G/} +.endif + .include .if ${ARCH} == amd64