From owner-svn-ports-all@freebsd.org Mon Mar 8 21:21:15 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6943A558DC4; Mon, 8 Mar 2021 21:21:15 +0000 (UTC) (envelope-from jhb@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 4DvWVM2Yszz3mSZ; Mon, 8 Mar 2021 21:21:15 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4B58E10412; Mon, 8 Mar 2021 21:21:15 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 128LLFDq003239; Mon, 8 Mar 2021 21:21:15 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 128LLExm003235; Mon, 8 Mar 2021 21:21:14 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202103082121.128LLExm003235@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Mon, 8 Mar 2021 21:21:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r567873 - in head/devel: freebsd-gcc6 freebsd-gcc9 X-SVN-Group: ports-head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: in head/devel: freebsd-gcc6 freebsd-gcc9 X-SVN-Commit-Revision: 567873 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Mar 2021 21:21:15 -0000 Author: jhb (src,doc committer) Date: Mon Mar 8 21:21:14 2021 New Revision: 567873 URL: https://svnweb.freebsd.org/changeset/ports/567873 Log: Tidy the Makefiles for devel/freebsd-gcc*. No functional change. - Sort BUILD_DEPENDS before LIB_DEPENDS and RUN_DEPENDS. - Quiet other warnings noted by portlint. - Sort USES. Requested by: mat (1), lwhsu (3) Reviewed by: lwhsu Differential Revision: https://reviews.freebsd.org/D29072 Modified: head/devel/freebsd-gcc6/Makefile head/devel/freebsd-gcc6/pkg-descr head/devel/freebsd-gcc9/Makefile head/devel/freebsd-gcc9/pkg-descr Modified: head/devel/freebsd-gcc6/Makefile ============================================================================== --- head/devel/freebsd-gcc6/Makefile Mon Mar 8 21:01:41 2021 (r567872) +++ head/devel/freebsd-gcc6/Makefile Mon Mar 8 21:21:14 2021 (r567873) @@ -4,7 +4,7 @@ PORTNAME= gcc PORTVERSION= 6.5.0 PORTREVISION= 2 CATEGORIES= devel -MASTER_SITES= GCC/releases/gcc-${DISTVERSION} +MASTER_SITES= GCC PKGNAMEPREFIX= ${TARGETARCH}- PKGNAMESUFFIX= ${SUFFIX} @@ -14,19 +14,20 @@ COMMENT= Cross GNU Compiler Collection for ${TARGETARC LICENSE= GPLv3 GPLv3RLE LICENSE_COMB= multi +BUILD_DEPENDS= ${BU_PREFIX}-as:devel/binutils@${TARGETARCH} \ + objdump:devel/binutils LIB_DEPENDS= libgmp.so:math/gmp \ libmpfr.so:math/mpfr \ libmpc.so:math/mpc -BUILD_DEPENDS= ${BU_PREFIX}-as:devel/binutils@${TARGETARCH} \ - objdump:devel/binutils RUN_DEPENDS= ${BU_PREFIX}-as:devel/binutils@${TARGETARCH} FLAVORS= aarch64 amd64 i386 mips mips64 powerpc64 sparc64 TARGETARCH= ${FLAVOR} +USES= compiler:c++11-lang gmake iconv libtool makeinfo tar:xz + CONFLICTS= ${TARGETARCH}-gcc -USES= gmake iconv libtool tar:xz makeinfo compiler:c++11-lang PLIST_SUB= OPSYS=${OPSYS:tl} \ SUFFIX=${SUFFIX} \ TARGETARCH=${TARGETARCH} \ @@ -124,8 +125,8 @@ post-install: # Conflicts with sys/x86/include/float.h ${RM} ${STAGEDIR}${PREFIX}/lib/gcc/${GCC_TARGET}/${PORTVERSION}/include/float.h .endif - @${MKDIR} ${STAGEDIR}${PREFIX}/share/toolchains/ - @${INSTALL_DATA} ${WRKDIR}/xtoolchain.mk \ + ${MKDIR} ${STAGEDIR}${PREFIX}/share/toolchains/ + ${INSTALL_DATA} ${WRKDIR}/xtoolchain.mk \ ${STAGEDIR}${PREFIX}/share/toolchains/${TARGETARCH}-gcc${SUFFIX}.mk .include Modified: head/devel/freebsd-gcc6/pkg-descr ============================================================================== --- head/devel/freebsd-gcc6/pkg-descr Mon Mar 8 21:01:41 2021 (r567872) +++ head/devel/freebsd-gcc6/pkg-descr Mon Mar 8 21:21:14 2021 (r567873) @@ -1,3 +1,4 @@ -GCC, the GNU Compiler Collection supporting C and C++ for targetting crossbuilding. +GCC, the GNU Compiler Collection, supporting C and C++ for building the +FreeBSD base system. WWW: http://gcc.gnu.org/ Modified: head/devel/freebsd-gcc9/Makefile ============================================================================== --- head/devel/freebsd-gcc9/Makefile Mon Mar 8 21:01:41 2021 (r567872) +++ head/devel/freebsd-gcc9/Makefile Mon Mar 8 21:21:14 2021 (r567873) @@ -3,7 +3,7 @@ PORTNAME= gcc PORTVERSION= 9.3.0 CATEGORIES= devel -MASTER_SITES= GCC/releases/gcc-${DISTVERSION} +MASTER_SITES= GCC PKGNAMEPREFIX= ${TARGETARCH}- PKGNAMESUFFIX= ${SUFFIX} @@ -13,17 +13,18 @@ COMMENT= Cross GNU Compiler Collection for ${TARGETARC LICENSE= GPLv3 GPLv3RLE LICENSE_COMB= multi +BUILD_DEPENDS= ${BU_PREFIX}-as:devel/binutils@${TARGETARCH} \ + objdump:devel/binutils LIB_DEPENDS= libgmp.so:math/gmp \ libmpfr.so:math/mpfr \ libmpc.so:math/mpc -BUILD_DEPENDS= ${BU_PREFIX}-as:devel/binutils@${TARGETARCH} \ - objdump:devel/binutils RUN_DEPENDS= ${BU_PREFIX}-as:devel/binutils@${TARGETARCH} FLAVORS= aarch64 amd64 i386 mips mips64 powerpc powerpc64 riscv64 sparc64 TARGETARCH= ${FLAVOR} -USES= gmake iconv libtool tar:xz makeinfo compiler:c++11-lang +USES= compiler:c++11-lang gmake iconv libtool makeinfo tar:xz + PLIST_SUB= OPSYS=${OPSYS:tl} \ SUFFIX=${SUFFIX} \ TARGETARCH=${TARGETARCH} \ @@ -131,8 +132,8 @@ post-install: # Conflicts with sys/x86/include/float.h ${RM} ${STAGEDIR}${PREFIX}/lib/gcc/${GCC_TARGET}/${PORTVERSION}/include/float.h .endif - @${MKDIR} ${STAGEDIR}${PREFIX}/share/toolchains/ - @${INSTALL_DATA} ${WRKDIR}/xtoolchain.mk \ + ${MKDIR} ${STAGEDIR}${PREFIX}/share/toolchains/ + ${INSTALL_DATA} ${WRKDIR}/xtoolchain.mk \ ${STAGEDIR}${PREFIX}/share/toolchains/${TARGETARCH}-gcc${SUFFIX}.mk .include Modified: head/devel/freebsd-gcc9/pkg-descr ============================================================================== --- head/devel/freebsd-gcc9/pkg-descr Mon Mar 8 21:01:41 2021 (r567872) +++ head/devel/freebsd-gcc9/pkg-descr Mon Mar 8 21:21:14 2021 (r567873) @@ -1,3 +1,4 @@ -GCC, the GNU Compiler Collection supporting C and C++ for targetting crossbuilding. +GCC, the GNU Compiler Collection, supporting C and C++ for building the +FreeBSD base system. WWW: http://gcc.gnu.org/