From nobody Tue Nov 21 21:46:25 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 4SZdHP2n72z52MCd; Tue, 21 Nov 2023 21:46:25 +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 4SZdHP2Fzmz3gNv; Tue, 21 Nov 2023 21:46:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700603185; 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=c4j/9wsQR0I6jP+InHbveajIlyEClwuEZt5gjUvsNHM=; b=SCDF2GOJpUstjz2oq7X+91rMBD+lYz4/FD7Ujv6qAZimSZ98Jevrt2YORlwUSc9mFN5UqS jp3ztJLCXTXGbZ1hHTJXA6lofQjHhYH/Jf2t1OZl7l4FqILGr7ghlQvYRkaN7Qh1YXu2qi FbgJt9hCozWqiPwhpd+fg+5MU6v5Fw+E2b0orq7uIKqsNlSuzvgU3CFI8mvzjGxB0kGDzd SF+ed0Aff4jSCvcI3Gi5AS2X0EHNC7ZyWP8lHbYoeOYqBbAX8mky0tDGCesKcwBSqG7S26 BQzj+gvJ6m1zGyEn9E+ATcpHzlGp/fwJSss7tko36x8VPnEYismYnAQ+GtpAHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700603185; 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=c4j/9wsQR0I6jP+InHbveajIlyEClwuEZt5gjUvsNHM=; b=xctLKKMFc7BlxWLiWGGeeon6XcVL8Fd8wngvy7wx6jZdR6z0DDkStE5zMIkv4bpZGntAM9 xh5DB/j9cAEH9glw5vUU+2B7b2XiTJTa+4WY4DI7F/4/PIUEWgyKL46uK2Ibd53fXkfdIC i6GHhtibPm+/ScnxrzdOJWd+qHs26tf2CPnehmtc04kKdkNlBx2IpiJlrUyaBKQ/YLjrKC J+D5sal30Ge8KEQVZuj1XQaItnlDTPvLwwg7IO2bwVKS264o5iED+UL066fppllHHwwOYk 3sUInGysGmWhSr9Z4TGhYGJyW+1+zXyQXWT3hTQiDAB0NF0Asl5BkCL486muAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700603185; a=rsa-sha256; cv=none; b=rbYoMrP9/SagN93wwgYJlzkS8iW3Fj2OLfSyzKNVYfXUhPuBdowJYl68UeCYwvgVIZaQsQ lxLdDc78Fpa5oEMYwo5VM7VMXflZxFhUgsI2ludRAYnc4mlKs7/PD2MU9LXNAe3rIOxGyH 7XBmgnwmW2IT3+Jxmjm4p1/DJzRZ/OoFInRc9F3I86i3D13mMmhI31ihTNYJgEN5e3H3oZ iuTsu653Bv/59LjfFucFp3gb6UljsYhXD0ru39pcVAK5iMRDMn3Ztre96lgOm5EWDaxqo+ 4xfqcRu32cRLbp8HUo4K3gu/7hStWyF0m1cAd2sAc7bBfoTdO0SM+F+NRhf9kA== 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 4SZdHP1JPNzrnS; Tue, 21 Nov 2023 21:46:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ALLkPTN064484; Tue, 21 Nov 2023 21:46:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ALLkPLp064481; Tue, 21 Nov 2023 21:46:25 GMT (envelope-from git) Date: Tue, 21 Nov 2023 21:46:25 GMT Message-Id: <202311212146.3ALLkPLp064481@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: John Baldwin Subject: git: 5723f9adab52 - main - devel/freebsd-gcc{9,12}: Various cleanups, no functional change 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: jhb X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5723f9adab52b897b119d0b53a2939c75f6fdc3f Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/ports/commit/?id=5723f9adab52b897b119d0b53a2939c75f6fdc3f commit 5723f9adab52b897b119d0b53a2939c75f6fdc3f Author: John Baldwin AuthorDate: 2023-11-21 21:45:52 +0000 Commit: John Baldwin CommitDate: 2023-11-21 21:45:52 +0000 devel/freebsd-gcc{9,12}: Various cleanups, no functional change - Use DISTVERSION instead of PORTVERISON - Don't silence post-install commands to remove various files from the staging area - Simplify logic to handle arch-specific packing lists - Clarify package comment and description - Clarify FreeBSD 12 ignore rule for gcc12 Reviewed by: fuz Differential Revision: https://reviews.freebsd.org/D42590 --- devel/freebsd-gcc12/Makefile | 33 ++++++------------- devel/freebsd-gcc12/pkg-descr | 4 +-- .../{pkg-plist.riscv => pkg-plist.riscv64} | 0 devel/freebsd-gcc9/Makefile | 37 +++++----------------- devel/freebsd-gcc9/pkg-descr | 4 +-- .../{pkg-plist.riscv => pkg-plist.riscv64} | 0 6 files changed, 21 insertions(+), 57 deletions(-) diff --git a/devel/freebsd-gcc12/Makefile b/devel/freebsd-gcc12/Makefile index b1d33c394213..3908ae055431 100644 --- 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 @@ PLIST_SUB+= FLOAT_H="" .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 index aa16abf61500..505ca21589ce 100644 --- 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 similarity index 100% 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 index 7b9bcdd8db65..8a7eec722c63 100644 --- 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 @@ 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 @@ -107,42 +107,21 @@ PLIST_SUB+= FLOAT_H="" .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 index aa16abf61500..505ca21589ce 100644 --- 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 similarity index 100% rename from devel/freebsd-gcc9/pkg-plist.riscv rename to devel/freebsd-gcc9/pkg-plist.riscv64