svn commit: r350787 - head/lang/gcc-aux

[John Marino]

Author: marino
Date: Thu Apr 10 08:45:30 2014
New Revision: 350787
URL: http://svnweb.freebsd.org/changeset/ports/350787
QAT: https://qat.redports.org/buildarchive/r350787/

Log:
  lang/gcc-aux: Add binutils requirement for FreeBSD
  
  This patch was previously developed but lost somewhere along the way.
  The linker and assembly must be explicitly defined otherwise it is
  defined as "ld" and "as" and as such is affected by the value of PATH.
  We don't want this, and it actually breaks the gnatdroid cross compilers.
  
  For FreeBSD, use the binutils port like the gcc ports do.  DragonFly
  has binutils 2.24 in base so let's keep using the base binutils on that
  platform.
  
  Also the Makefile.version file now defines the PORTREVISION for all
  the ports that use it to make future updating easier.
  
  Binutils patch omission partly detected by jenkins failure (thx swills)

Modified:
  head/lang/gcc-aux/Makefile
  head/lang/gcc-aux/Makefile.version

Modified: head/lang/gcc-aux/Makefile
==============================================================================
--- head/lang/gcc-aux/Makefile	Thu Apr 10 08:29:18 2014	(r350786)
+++ head/lang/gcc-aux/Makefile	Thu Apr 10 08:45:30 2014	(r350787)
@@ -3,6 +3,7 @@
 
 PORTNAME=	gcc-aux
 PORTVERSION=	${SNAPSHOT}
+PORTREVISION=	${MAIN_PR}
 CATEGORIES=	lang
 MASTER_SITES=	http://downloads.dragonlace.net/src/:boot \
 		LOCAL/marino:boot ${MASTER_SITE_GCC}
@@ -46,6 +47,10 @@ BOOTSTRAP_DESC=		Create bootstrap compil
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD
+USE_BINUTILS=	yes
+RUN_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
+EXTRA_CONFIG+=	--with-ld=${LOCALBASE}/bin/ld
+EXTRA_CONFIG+=	--with-as=${LOCALBASE}/bin/as
 .  if ${OSVERSION} < 900000
 BOOTSTRAP_COMPILER=	ada-bootstrap.${GARCH}.freebsd.84.tar.bz2
 .  else
@@ -53,6 +58,8 @@ BOOTSTRAP_COMPILER=	ada-bootstrap.${GARC
 .  endif
 .endif
 .if ${OPSYS} == DragonFly
+EXTRA_CONFIG+=	--with-ld=/usr/bin/ld
+EXTRA_CONFIG+=	--with-as=/usr/bin/as
 BOOTSTRAP_COMPILER=	ada-bootstrap.${GARCH}.dragonfly.36A.tar.bz2
 .endif
 

Modified: head/lang/gcc-aux/Makefile.version
==============================================================================
--- head/lang/gcc-aux/Makefile.version	Thu Apr 10 08:29:18 2014	(r350786)
+++ head/lang/gcc-aux/Makefile.version	Thu Apr 10 08:45:30 2014	(r350787)
@@ -4,6 +4,9 @@ GCC_BRANCH=		4.9
 GCC_POINT=		0
 GCC_VERSION=		${GCC_BRANCH}.${GCC_POINT}
 SNAPSHOT=		20140406
+MAIN_PR=		1
+ARMV5_PR=		1
+ARMV7_PR=		1
 IDENTIFICATION=		gcc-${GCC_BRANCH}-${SNAPSHOT}
 MS_SUBDIR=		snapshots/${GCC_BRANCH}-${SNAPSHOT}