From nobody Mon Jun 19 13:18:08 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 4Ql9LS5glhz4f73x; Mon, 19 Jun 2023 13:18:08 +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 4Ql9LS5DxJz3xjD; Mon, 19 Jun 2023 13:18:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687180688; 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=tAffPq1ktZE3+6zbWYhMMOJ6/F/PYXEnyBCabNqXKTk=; b=k3Wdq/B1rbiAiAD2ln8Azwx5YK3Cz3Vcvr3AKUkH3wiRB2jFF0ksip2J9Y37xjb3vAx2or q57HNei5lEhxtdkwrECDDlnUK0PpmzeIoehwB8pUaxztACYZykogxEU6pjIfj/f6nlYTPv HmcjJE4HfTsrnENjaYoWpaTV7qfDHcbW8sUJaAs7AOYsmmIj9ODaaMJyoQxf+o02s/g6y2 eNf79V21hAJVPi3mKr+qAypJrLy29C/x9HYnGujfdbyxIwIG0xd6nAEOBvwij0DYnQyRUM pSnwVCJuCT6aXKby6S3w9hYE9/VFPgRhXa46oJF5Od4OcYt8v46qxIqQ/0D4zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687180688; 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=tAffPq1ktZE3+6zbWYhMMOJ6/F/PYXEnyBCabNqXKTk=; b=Exr2+7E5/LBf4yMk75nLB4bHXcCzwUADVwlp1kcHf3YmQ+6kf6tR/5rtNIyV17Z5xeJLOl q7kdCnxdYz5G3Vf+v56sN1iKI61ir8FcmQTipVRynPeAb+D5dUBZf/gotz4gr1INkTbJZX cz/v2k/mnXenCs0Q39MN1+BEqoF/1zcUJOaNQimywlkrpS4rm27Ws7UsPOUDlOG0tq7m5O N2KNXHCDjF++uGsZKehrg8/yR6KHkpCC/LsaN6sivHFRBXYBIi5LrUjt9jKZZBjuQFxEhU LIDtWj9QocSmmicbMhX0W5PWyiPiB2jUocF2yDULVJrig6BUJAiGv74ukcrK4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687180688; a=rsa-sha256; cv=none; b=wUNE14RivGs3Ligj7QcQEe2dVxSqJl7NEH0szn3u7io9un4kskls7xOyFz381rZeXSN5MT mj5sEzIsk5pcWxMmQV2+eaTo6fapq7D5cnm72LuQZY/ZRRPG8SXvDr5RMbFdd32GslllzV v6JPkvWkp7MDWgZpo70DqOSUFMj4rqVxsFShCRMozSmDaYwfpN7ILJXJO5vjSpU5RXUYLG ae1sWwVihhjDh5x7+BwPLujqii94XbXde9ucBfsWwnILvkosRyyfD7M2YpijtcZR0Zvj3N f++eeslWZH+ZFJpWXjgiLkH7qrpxbH1koxJCA7pwEGO+WWimZUf4984dyXU2CA== 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 4Ql9LS428TzJgY; Mon, 19 Jun 2023 13:18:08 +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 35JDI8eM051946; Mon, 19 Jun 2023 13:18:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35JDI8Re051945; Mon, 19 Jun 2023 13:18:08 GMT (envelope-from git) Date: Mon, 19 Jun 2023 13:18:08 GMT Message-Id: <202306191318.35JDI8Re051945@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: dcbc273b6b19 - main - lang/gcc12: fix build on powerpc64* with CPUTYPE?=g[3-5] 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: dcbc273b6b19b13eac1b1fbbb013148e1721dc85 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=dcbc273b6b19b13eac1b1fbbb013148e1721dc85 commit dcbc273b6b19b13eac1b1fbbb013148e1721dc85 Author: Piotr Kubaj AuthorDate: 2023-06-18 19:25:47 +0000 Commit: Piotr Kubaj CommitDate: 2023-06-19 13:18:06 +0000 lang/gcc12: fix build on powerpc64* with CPUTYPE?=g[3-5] GCC doesn't support -mcpu=g4, but it supports -mcpu=G4. Same for g3 and g5. --- lang/gcc12/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lang/gcc12/Makefile b/lang/gcc12/Makefile index 1604c7fcfec8..fcca3cfd875d 100644 --- a/lang/gcc12/Makefile +++ b/lang/gcc12/Makefile @@ -60,6 +60,11 @@ MULTILIB_CONFIGURE_ENABLE= multilib CONFIGURE_ARGS+= --disable-multilib .endif +.if ${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 12.