svn commit: r488642 - in head/devel: amd64-gcc powerpc64-gcc
John Baldwin
jhb at FreeBSD.org
Sat Dec 29 00:44:13 UTC 2018
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
More information about the svn-ports-all
mailing list