Date: Mon, 19 Jun 2023 15:20:27 GMT From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 91117ec83f96 - main - lang/gcc*: fix build with CPUTYPE?=g[3-5] Message-ID: <202306191520.35JFKRAw059455@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=91117ec83f966fad5e943737928abe956cd49720 commit 91117ec83f966fad5e943737928abe956cd49720 Author: Piotr Kubaj <pkubaj@FreeBSD.org> AuthorDate: 2023-06-19 15:19:22 +0000 Commit: Piotr Kubaj <pkubaj@FreeBSD.org> 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 <bsd.port.pre.mk> .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 <bsd.port.pre.mk> .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 <bsd.port.pre.mk> # 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 <bsd.port.pre.mk> .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 <bsd.port.pre.mk> .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 <bsd.port.pre.mk> .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 <bsd.port.pre.mk> .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 <bsd.port.pre.mk> .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 <bsd.port.pre.mk> .if ${ARCH} == amd64
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306191520.35JFKRAw059455>