From owner-svn-ports-head@FreeBSD.ORG Sun Nov 30 09:16:17 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 211A9E48; Sun, 30 Nov 2014 09:16:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0135DBA7; Sun, 30 Nov 2014 09:16:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAU9GGw5052541; Sun, 30 Nov 2014 09:16:16 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAU9GGUg052539; Sun, 30 Nov 2014 09:16:16 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201411300916.sAU9GGUg052539@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sun, 30 Nov 2014 09:16:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r373658 - in head/devel: powerpc64-gcc powerpc64-xtoolchain-gcc X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 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: Sun, 30 Nov 2014 09:16:17 -0000 Author: bapt Date: Sun Nov 30 09:16:15 2014 New Revision: 373658 URL: https://svnweb.freebsd.org/changeset/ports/373658 QAT: https://qat.redports.org/buildarchive/r373658/ Log: Add the needed changes for amd64-gcc to build Reported by: antoine Pointyhat: bapt Modified: head/devel/powerpc64-gcc/Makefile head/devel/powerpc64-xtoolchain-gcc/Makefile Modified: head/devel/powerpc64-gcc/Makefile ============================================================================== --- head/devel/powerpc64-gcc/Makefile Sun Nov 30 02:17:50 2014 (r373657) +++ head/devel/powerpc64-gcc/Makefile Sun Nov 30 09:16:15 2014 (r373658) @@ -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}-${PORTV ALL_TARGET= all-gcc INSTALL_TARGET= install-gcc +.include + +.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/* Modified: head/devel/powerpc64-xtoolchain-gcc/Makefile ============================================================================== --- head/devel/powerpc64-xtoolchain-gcc/Makefile Sun Nov 30 02:17:50 2014 (r373657) +++ head/devel/powerpc64-xtoolchain-gcc/Makefile Sun Nov 30 09:16:15 2014 (r373658) @@ -13,15 +13,20 @@ COMMENT= Pre seeded toolchain to cross b 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} \