From owner-svn-ports-head@freebsd.org Sat Dec 29 00:44:13 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AEB5F1427DD3; Sat, 29 Dec 2018 00:44:13 +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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 563037341D; Sat, 29 Dec 2018 00:44:13 +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 487722AF0; Sat, 29 Dec 2018 00:44:13 +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 wBT0iDJV015031; Sat, 29 Dec 2018 00:44:13 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBT0iCgJ015029; Sat, 29 Dec 2018 00:44:12 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201812290044.wBT0iCgJ015029@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Sat, 29 Dec 2018 00:44:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r488642 - in head/devel: amd64-gcc powerpc64-gcc X-SVN-Group: ports-head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: in head/devel: amd64-gcc powerpc64-gcc X-SVN-Commit-Revision: 488642 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 563037341D X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.978,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.998,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Dec 2018 00:44:13 -0000 Author: jhb (src,doc committer) Date: Sat Dec 29 00:44:12 2018 New Revision: 488642 URL: https://svnweb.freebsd.org/changeset/ports/488642 Log: Simplify some of the logic for external GCC toolchain packages. - Always define BU_PREFIX as GCC_TARGET if needed. This was already effectively true, but BU_PREFIX was just being set to the same value in the case that GCC_TARGET wasn't defined. This is simpler and avoids duplicating some logic. - Simplify amd64-gcc by not defining GCC_TARGET and BU_PREFIX in that port but instead replacing "amd64" with "x86_64" in the devel/powerpc64-gcc Makefile. This matches what base/gcc does. - Remove FREEBSD_EXTENSION now that it is no longer needed. Approved by: zeising Differential Revision: https://reviews.freebsd.org/D18349 Modified: head/devel/amd64-gcc/Makefile head/devel/powerpc64-gcc/Makefile Modified: head/devel/amd64-gcc/Makefile ============================================================================== --- head/devel/amd64-gcc/Makefile Sat Dec 29 00:42:15 2018 (r488641) +++ head/devel/amd64-gcc/Makefile Sat Dec 29 00:44:12 2018 (r488642) @@ -4,9 +4,6 @@ PKGNAMEPREFIX= amd64- PLIST= ${.CURDIR}/pkg-plist MASTERDIR= ${.CURDIR}/../powerpc64-gcc -GCC_TARGET= x86_64-unknown-${OPSYS:tl}${OSREL} -BU_PREFIX= x86_64-unknown-${OPSYS:tl}${OSREL} -FREEBSD_EXTENSION= yes BROKEN_aarch64= invalid output constraint '=a' in assembler BROKEN_armv6= invalid output constraint '=a' in assembler Modified: head/devel/powerpc64-gcc/Makefile ============================================================================== --- head/devel/powerpc64-gcc/Makefile Sat Dec 29 00:42:15 2018 (r488641) +++ head/devel/powerpc64-gcc/Makefile Sat Dec 29 00:44:12 2018 (r488642) @@ -25,19 +25,14 @@ PLIST_SUB= TARGETARCH=${PKGNAMEPREFIX:C/-//g} \ GCC_TARGET=${GCC_TARGET} \ GCC_VERSION=${PORTVERSION} +TARGETARCH= ${PKGNAMEPREFIX:C/-//g:S/amd64/x86_64/} + .if empty(GCC_TARGET) # We are building for a FreeBSD target -GCC_TARGET?= ${PKGNAMEPREFIX}unknown-${OPSYS:tl}${OSREL} -BU_PREFIX?= ${PKGNAMEPREFIX}unknown-${OPSYS:tl}${OSREL} +GCC_TARGET= ${PKGNAMEPREFIX:S/amd64/x86_64/}unknown-${OPSYS:tl}${OSREL} EXTRA_PATCHES+= ${FILESDIR}/freebsd-format-extensions -.else -BU_PREFIX?= ${GCC_TARGET} -.if defined(FREEBSD_EXTENSION) -EXTRA_PATCHES+= ${FILESDIR}/freebsd-format-extensions .endif -.endif - -TARGETARCH=${PKGNAMEPREFIX:C/-//g} +BU_PREFIX?= ${GCC_TARGET} GNU_CONFIGURE= yes CONFIGURE_OUTSOURCE= yes