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

[John Marino]

Author: marino
Date: Tue May 13 18:47:42 2014
New Revision: 353978
URL: http://svnweb.freebsd.org/changeset/ports/353978
QAT: https://qat.redports.org/buildarchive/r353978/

Log:
  lang/gcc-aux: Require latest binutils for DF 3.6 and earlier
  
  Based on observations from pkgsrc and recent failures on Dragonfly 3.6,
  it appears that GCC 4.9 requires a linker from binutils 2.23 or later.
  DF 3.6 uses binutils 2.22 while the master branch uses 2.24 by default.
  This adds the binutils requirement for DF 3.6 and earlier.

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

Modified: head/lang/gcc-aux/Makefile
==============================================================================
--- head/lang/gcc-aux/Makefile	Tue May 13 18:30:23 2014	(r353977)
+++ head/lang/gcc-aux/Makefile	Tue May 13 18:47:42 2014	(r353978)
@@ -40,7 +40,7 @@ TESTSUITE_DESC=		Activate test support
 STATIC_DESC=		Link compilers and drivers statically
 BOOTSTRAP_DESC=		Create bootstrap compiler (overrides other options)
 
-# The BOOTSTRAP option overrides all the others.  "make stage" will build a 
+# The BOOTSTRAP option overrides all the others.  "make stage" will build a
 # static compiler that supports C, C++, and Ada languages and then create
 # a new distfile in $WRKDIR/newbsd with the name following the pattern:
 # ada-bootstrap.$ARCH.$OPSYS.XY.tar.bz2.  There is no need to "make install"
@@ -48,10 +48,7 @@ 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
+MODERN_BINUTILS=	yes
 .  if ${OSVERSION} < 900000
 BOOTSTRAP_COMPILER=	ada-bootstrap.${GARCH}.freebsd.84.tar.bz2
 .  else
@@ -59,9 +56,21 @@ BOOTSTRAP_COMPILER=	ada-bootstrap.${GARC
 .  endif
 .endif
 .if ${OPSYS} == DragonFly
+.  if ${OSREL:S/.//} < 37
+MODERN_BINUTILS=	yes
+.  endif
+BOOTSTRAP_COMPILER=	ada-bootstrap.${GARCH}.dragonfly.36A.tar.bz2
+.endif
+
+.if defined(MODERN_BINUTILS)
+# Apparently gcc 4.9 needs binutils 2.23 or greater to link Ada correctly
+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
+.else
 EXTRA_CONFIG+=	--with-ld=/usr/bin/ld
 EXTRA_CONFIG+=	--with-as=/usr/bin/as
-BOOTSTRAP_COMPILER=	ada-bootstrap.${GARCH}.dragonfly.36A.tar.bz2
 .endif
 
 WRKSRC=			${WRKDIR}/${IDENTIFICATION}
@@ -252,7 +261,7 @@ do-install:
 	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} \
 		${MAKE_CMD} install-strip ${MAKE_ARGS}
 	${MV} ${STAGEDIR}${PKG_PREFIX}/share ${WRKDIR}/moved_share
-	${MKDIR} -p ${STAGEDIR}${PREFIX}/share/dejagnu/baseboards \
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/dejagnu/baseboards \
 		${STAGEDIR}${PREFIX}/share/dejagnu/config
 	${INSTALL_DATA} ${FILESDIR}/android.exp \
 		${STAGEDIR}${PREFIX}/share/dejagnu/config

Modified: head/lang/gcc-aux/Makefile.version
==============================================================================
--- head/lang/gcc-aux/Makefile.version	Tue May 13 18:30:23 2014	(r353977)
+++ head/lang/gcc-aux/Makefile.version	Tue May 13 18:47:42 2014	(r353978)
@@ -4,7 +4,7 @@ GCC_BRANCH=		4.9
 GCC_POINT=		0
 GCC_VERSION=		${GCC_BRANCH}.${GCC_POINT}
 SNAPSHOT=		20140422
-MAIN_PR=		0
+MAIN_PR=		1
 ARMV5_PR=		0
 ARMV7_PR=		0