From 4a36f4df76dd14a5e94fa729df91cd25a55c0d6e Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sun, 30 Nov 2014 09:16:15 +0000
Subject: [PATCH] Add the needed changes for amd64-gcc to build

Reported by:	antoine
Pointyhat:	bapt
---
 devel/powerpc64-gcc/Makefile            | 26 ++++++++++++++++++++++---
 devel/powerpc64-xtoolchain-gcc/Makefile | 13 +++++++++----
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/devel/powerpc64-gcc/Makefile b/devel/powerpc64-gcc/Makefile
index c4979c30efeb..7c39bc333498 100644
--- a/devel/powerpc64-gcc/Makefile
+++ b/devel/powerpc64-gcc/Makefile
@@ -30,12 +30,16 @@ WRKSRC=	${WRKDIR}/build-gcc
 
 .if empty(GCC_TARGET)
 # We are building for a FreeBSD target
-GCC_TARGET=	${PKGNAMEPREFIX}portbld-${OPSYS:tl}${OSREL}
-BU_PREFIX=	${PKGNAMEPREFIX}${OPSYS:tl}
+GCC_TARGET?=	${PKGNAMEPREFIX}portbld-${OPSYS:tl}${OSREL}
+BU_PREFIX?=	${PKGNAMEPREFIX}${OPSYS:tl}
 EXTRA_PATCHES+= ${FILESDIR}/freebsd-format-extensions
 .else
-BU_PREFIX=	${GCC_TARGET}
+BU_PREFIX?=	${GCC_TARGET}
+.if defined(FREEBSD_EXTENSION)
+EXTRA_PATCHES+= ${FILESDIR}/freebsd-format-extensions
 .endif
+.endif
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--target=${GCC_TARGET} --disable-nls --enable-languages=c,c++ \
 		--without-headers \
@@ -50,10 +54,26 @@ CONFIGURE_SCRIPT=	../${PORTNAME}-${PORTVERSION}/configure
 ALL_TARGET=	all-gcc
 INSTALL_TARGET=	install-gcc
 
+.include <bsd.port.options.mk>
+
+.if ${ARCH} == "amd64"
+CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:tl}${OSREL}
+.else
+CONFIGURE_TARGET=	${ARCH}-portbld-${OPSYS:tl}${OSREL}
+.endif
+
 post-extract:
 	@${MKDIR} ${WRKSRC}
 
 post-stage:
+	@if [ -f ${STAGEDIR}${PREFIX}/bin/cpp ] ; then \
+		mv ${STAGEDIR}${PREFIX}/bin/cpp  \
+		    ${STAGEDIR}${PREFIX}/bin/${GCC_TARGET}-cpp ; \
+	fi
+.for f in c++ cpp g++ gcc gcc-ar gcc-nm gcc-ranlib gcov
+	@${RM} ${STAGEDIR}${PREFIX}/bin/$f
+	@${RM} ${STAGEDIR}${PREFIX}/man/man1/$f.1.gz
+.endfor
 	@${RM} ${STAGEDIR}${PREFIX}/info/*
 	@${RM} ${STAGEDIR}${PREFIX}/man/man7/*
 
diff --git a/devel/powerpc64-xtoolchain-gcc/Makefile b/devel/powerpc64-xtoolchain-gcc/Makefile
index fc57a6dfb99b..4f7febca3c1e 100644
--- a/devel/powerpc64-xtoolchain-gcc/Makefile
+++ b/devel/powerpc64-xtoolchain-gcc/Makefile
@@ -13,15 +13,20 @@ COMMENT=	Pre seeded toolchain to cross build FreeBSD base
 
 NO_BUILD=	yes
 
-XCC?=		${PKGNAMEPREFIX}portbld-${OPSYS:tl}${OSREL}-gcc
-XCXX?=		${PKGNAMEPREFIX}portbld-${OPSYS:tl}${OSREL}-g++
-XCPP?=		${PKGNAMEPREFIX}portbld-${OPSYS:tl}${OSREL}-cpp
+.if ${PKGNAMEPREFIX} == "amd64-"
+TOOLCHAIN_PREFIX=	x86_64-
+.else
+TOOLCHAIN_PREFIX=	${PKGNAMEPREFIX}
+.endif
+XCC?=		${TOOLCHAIN_PREFIX}portbld-${OPSYS:tl}${OSREL}-gcc
+XCXX?=		${TOOLCHAIN_PREFIX}portbld-${OPSYS:tl}${OSREL}-g++
+XCPP?=		${TOOLCHAIN_PREFIX}portbld-${OPSYS:tl}${OSREL}-cpp
 X_COMPILER_TYPE?=	${PKGNAMESUFFIX:C/-//g}
 
 RUN_DEPENDS?=	${XCC}:${PORTSDIR}/devel/${PKGNAMEPREFIX}${X_COMPILER_TYPE}
 
 SUB_FILES=	xtoolchain.mk
-SUB_LIST=	TARGETARCH=${PKGNAMEPREFIX:C/-//g} \
+SUB_LIST=	TARGETARCH=${TOOLCHAIN_PREFIX:C/-//g} \
 		OPSYS=${OPSYS:tl} \
 		XCC=${XCC} \
 		XCXX=${XCXX} \