Page MenuHomeFreeBSD
Files F161148226

D42590.diff
No OneTemporary
Actions

D42590.diff
View Options

diff --git a/devel/freebsd-gcc12/Makefile b/devel/freebsd-gcc12/Makefile
--- a/devel/freebsd-gcc12/Makefile
+++ b/devel/freebsd-gcc12/Makefile
@@ -1,18 +1,18 @@
PORTNAME= gcc
-PORTVERSION= 12.3.0
+DISTVERSION= 12.3.0
CATEGORIES= devel
MASTER_SITES= GCC
PKGNAMEPREFIX= ${TARGETARCH}-
PKGNAMESUFFIX= ${SUFFIX}
MAINTAINER= jhb@FreeBSD.org
-COMMENT= Cross GNU Compiler Collection for ${TARGETARCH}
+COMMENT= Cross GNU Compiler ${SUFFIX} for FreeBSD/${TARGETARCH}
WWW= https://gcc.gnu.org/
LICENSE= GPLv3 GPLv3RLE
LICENSE_COMB= multi
-IGNORE_FreeBSD_12= Not supported on FreeBSD 12
+IGNORE_FreeBSD_12= Does not build
BUILD_DEPENDS= ${BU_PREFIX}-as:devel/binutils@${BU_FLAVOR} \
objdump:devel/binutils
@@ -106,36 +106,21 @@
.endif
PLIST= ${.CURDIR}/pkg-plist
+PLISTARCH= ${TARGETARCH:C/armv[67]/arm_gnueabi/}
+PLIST+= ${.CURDIR}/pkg-plist.${PLISTARCH}
-.if ${TARGETARCH} == "aarch64"
-PLIST+= ${.CURDIR}/pkg-plist.aarch64
-.endif
.if ${TARGETARCH} == "aarch64" || ${TARGETARCH:Marm*}
PLIST+= ${.CURDIR}/pkg-plist.arm
.endif
-.if ${TARGETARCH:Marm*}
-PLIST+= ${.CURDIR}/pkg-plist.arm_gnueabi
-.endif
.if ${TARGETARCH} == "amd64"
-PLIST+= ${.CURDIR}/pkg-plist.amd64
-.endif
-.if ${TARGETARCH} == "amd64" || ${TARGETARCH} == "i386"
PLIST+= ${.CURDIR}/pkg-plist.i386
.endif
-.if ${TARGETARCH:Mpowerpc64*}
-PLIST+= ${.CURDIR}/pkg-plist.powerpc64
-.elif ${TARGETARCH:Mpowerpc*}
-PLIST+= ${.CURDIR}/pkg-plist.powerpc
-.endif
-.if ${TARGETARCH:Mriscv*}
-PLIST+= ${.CURDIR}/pkg-plist.riscv
-.endif
post-install:
- @${RM} ${STAGEDIR}${PREFIX}/bin/${GCC_TARGET}-${GCC_TARGET}-*
- @${RM} ${STAGEDIR}${PREFIX}/share/info/*
- @${RM} ${STAGEDIR}${PREFIX}/man/man7/*
- @${RM} -r ${STAGEDIR}${PREFIX}/lib/gcc/${GCC_TARGET}/${PORTVERSION}/include-fixed
+ ${RM} ${STAGEDIR}${PREFIX}/bin/${GCC_TARGET}-${GCC_TARGET}-*
+ ${RM} ${STAGEDIR}${PREFIX}/share/info/*
+ ${RM} ${STAGEDIR}${PREFIX}/man/man7/*
+ ${RM} -r ${STAGEDIR}${PREFIX}/lib/gcc/${GCC_TARGET}/${PORTVERSION}/include-fixed
.if ${TARGETARCH} == "amd64" || ${TARGETARCH} == "i386"
# Conflicts with sys/x86/include/float.h
${RM} ${STAGEDIR}${PREFIX}/lib/gcc/${GCC_TARGET}/${PORTVERSION}/include/float.h
diff --git a/devel/freebsd-gcc12/pkg-descr b/devel/freebsd-gcc12/pkg-descr
--- a/devel/freebsd-gcc12/pkg-descr
+++ b/devel/freebsd-gcc12/pkg-descr
@@ -1,2 +1,2 @@
-GCC, the GNU Compiler Collection, supporting C and C++ for building the
-FreeBSD base system.
+GCC, the GNU C/C++ Compiler, customized to build the FreeBSD base system.
+To use GCC for other purposes, please use one of the lang/gcc* packages.
diff --git a/devel/freebsd-gcc12/pkg-plist.riscv b/devel/freebsd-gcc12/pkg-plist.riscv64
rename from devel/freebsd-gcc12/pkg-plist.riscv
rename to devel/freebsd-gcc12/pkg-plist.riscv64
diff --git a/devel/freebsd-gcc9/Makefile b/devel/freebsd-gcc9/Makefile
--- a/devel/freebsd-gcc9/Makefile
+++ b/devel/freebsd-gcc9/Makefile
@@ -1,5 +1,5 @@
PORTNAME= gcc
-PORTVERSION= 9.5.0
+DISTVERSION= 9.5.0
PORTREVISION= 11
CATEGORIES= devel
MASTER_SITES= GCC
@@ -7,7 +7,7 @@
PKGNAMESUFFIX= ${SUFFIX}
MAINTAINER= jhb@FreeBSD.org
-COMMENT= Cross GNU Compiler Collection for ${TARGETARCH}
+COMMENT= Cross GNU Compiler ${SUFFIX} for FreeBSD/${TARGETARCH}
WWW= https://gcc.gnu.org/
LICENSE= GPLv3 GPLv3RLE
@@ -107,42 +107,21 @@
.endif
PLIST= ${.CURDIR}/pkg-plist
+PLISTARCH= ${TARGETARCH:C/armv[67]/arm_gnueabi/:C/mips.*/mips/}
+PLIST+= ${.CURDIR}/pkg-plist.${PLISTARCH}
-.if ${TARGETARCH} == "aarch64"
-PLIST+= ${.CURDIR}/pkg-plist.aarch64
-.endif
.if ${TARGETARCH} == "aarch64" || ${TARGETARCH:Marm*}
PLIST+= ${.CURDIR}/pkg-plist.arm
.endif
-.if ${TARGETARCH:Marm*}
-PLIST+= ${.CURDIR}/pkg-plist.arm_gnueabi
-.endif
.if ${TARGETARCH} == "amd64"
-PLIST+= ${.CURDIR}/pkg-plist.amd64
-.endif
-.if ${TARGETARCH} == "amd64" || ${TARGETARCH} == "i386"
PLIST+= ${.CURDIR}/pkg-plist.i386
.endif
-.if ${TARGETARCH:Mmips*}
-PLIST+= ${.CURDIR}/pkg-plist.mips
-.endif
-.if ${TARGETARCH:Mpowerpc64*}
-PLIST+= ${.CURDIR}/pkg-plist.powerpc64
-.elif ${TARGETARCH:Mpowerpc*}
-PLIST+= ${.CURDIR}/pkg-plist.powerpc
-.endif
-.if ${TARGETARCH:Mriscv*}
-PLIST+= ${.CURDIR}/pkg-plist.riscv
-.endif
-.if ${TARGETARCH} == "sparc64"
-PLIST+= ${.CURDIR}/pkg-plist.sparc64
-.endif
post-install:
- @${RM} ${STAGEDIR}${PREFIX}/bin/${GCC_TARGET}-${GCC_TARGET}-*
- @${RM} ${STAGEDIR}${PREFIX}/share/info/*
- @${RM} ${STAGEDIR}${PREFIX}/man/man7/*
- @${RM} -r ${STAGEDIR}${PREFIX}/lib/gcc/${GCC_TARGET}/${PORTVERSION}/include-fixed
+ ${RM} ${STAGEDIR}${PREFIX}/bin/${GCC_TARGET}-${GCC_TARGET}-*
+ ${RM} ${STAGEDIR}${PREFIX}/share/info/*
+ ${RM} ${STAGEDIR}${PREFIX}/man/man7/*
+ ${RM} -r ${STAGEDIR}${PREFIX}/lib/gcc/${GCC_TARGET}/${PORTVERSION}/include-fixed
.if ${TARGETARCH} == "amd64" || ${TARGETARCH} == "i386"
# Conflicts with sys/x86/include/float.h
${RM} ${STAGEDIR}${PREFIX}/lib/gcc/${GCC_TARGET}/${PORTVERSION}/include/float.h
diff --git a/devel/freebsd-gcc9/pkg-descr b/devel/freebsd-gcc9/pkg-descr
--- a/devel/freebsd-gcc9/pkg-descr
+++ b/devel/freebsd-gcc9/pkg-descr
@@ -1,2 +1,2 @@
-GCC, the GNU Compiler Collection, supporting C and C++ for building the
-FreeBSD base system.
+GCC, the GNU C/C++ Compiler, customized to build the FreeBSD base system.
+To use GCC for other purposes, please use one of the lang/gcc* packages.
diff --git a/devel/freebsd-gcc9/pkg-plist.riscv b/devel/freebsd-gcc9/pkg-plist.riscv64
rename from devel/freebsd-gcc9/pkg-plist.riscv
rename to devel/freebsd-gcc9/pkg-plist.riscv64

File Metadata

Mime Type
text/plain
Expires
Thu, Jul 2, 12:00 AM (3 h, 41 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34581248
Default Alt Text
D42590.diff (5 KB)

Event Timeline