update to 20110325, from John Marino

changes:
-newer gcc snapshot
-add option to build c++ support (not enabled per default because
 the build fails due to something which looks like a command line
 length limitation on NetBSD)

3 files changed, 76 insertions, 23 deletions

diff --git a/lang/gnat-aux/Makefile b/lang/gnat-aux/Makefile
index 866beed4eac..9c5a2daebe2 100644
--- a/lang/gnat-aux/Makefile
+++ b/lang/gnat-aux/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/02/10 10:52:25 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2011/05/10 13:46:22 drochner Exp $
 #
 
 DISTNAME=	gnat-aux-${SNAPSHOT}
@@ -12,18 +12,19 @@ HOMEPAGE=	http://www.dragonlace.net/
 COMMENT=	GNAT Ada compiler based on GCC ${GCC_BRANCH}
 LICENSE=	gnu-gpl-v3 AND gnu-lgpl-v3
 
-SNAPSHOT=	20110203
-GCC_BRANCH=     4.6
-GCC_POINT=      0
+SNAPSHOT=	20110325
+GCC_BRANCH=	4.6
+GCC_POINT=	0
+LANGS=		c
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_TOOLS+=		gmake sed flex bison gm4 perl makeinfo bzip2
 USE_BUILTIN.iconv=	no
-BUILD_DEPENDS+=		dejagnu>=1.4:../../devel/dejagnu
 BUILD_DEPENDS+=		autoconf>=2.6:../../devel/autoconf
 
 .include "../../mk/bsd.prefs.mk"
+.include "options.mk"
 
 # Requires bootstrap compiler, which is only available for NetBSD i386/AMD64
 # and DragonFly i386/AMD64.  Actually bootstrap compilers for OpenBSD and
@@ -88,13 +89,11 @@ PKG_PREFIX=		${PREFIX}
 CONFIGURE_SCRIPT=	${GCC_WRKSRC}/configure
 BOOTSTRAP_PREFIX=	${WRKDIR}/bootstrap
 MAN7=			fsf-funding.7 gfdl.7 gpl.7
-SINFO=			share/info
 SMAN1=			share/man/man1
 SMAN7=			share/man/man7
 LPATH=			lib/gcc/${BLD_TARGET}/${GCC_BRANCH}.${GCC_POINT}
 LEPATH=			libexec/gcc/${BLD_TARGET}/${GCC_BRANCH}.${GCC_POINT}
 REVFILE= 		${GCC_WRKSRC}/gcc/REVISION
-LELIST=			cc1 collect2 gnat1 lto1
 
 
 
@@ -129,13 +128,16 @@ FULL_PATH=${BOOTSTRAP_PREFIX}/bin:/sbin:/bin:/usr/sbin:/usr/bin:${PREFIX}/sbin:$
 
 
 # establish ada-aware compiler for use
-MY_CONFIGURE_ENV=	CC=${FULL_GNATGCC} PATH=${FULL_PATH} CONFIG_SHELL=${CONFIG_SHELL}
+MY_CONFIGURE_ENV=	CC=${FULL_GNATGCC}
+MY_CONFIGURE_ENV+=	PATH=${FULL_PATH}
+MY_CONFIGURE_ENV+=	CONFIG_SHELL=${CONFIG_SHELL}
+MY_CONFIGURE_ENV+=	MAKEINFO=/usr/bin/false
 MY_MAKE_ENV=		PATH=${FULL_PATH}
 MY_MAKE_ENV+=		LD_LIBRARY_PATH=${WRKSRC}/gcc
 
 
 # The standard configuration options
-CONFIGURE_ARGS=		--enable-languages=c,ada
+CONFIGURE_ARGS= 	--enable-languages=${LANGS:Q}
 CONFIGURE_ARGS+=	--build=${BLD_TARGET}
 CONFIGURE_ARGS+=	--program-prefix=gnat
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
@@ -147,16 +149,13 @@ CONFIGURE_ARGS+=	--with-libiconv-prefix=${PKG_PREFIX}
 CONFIGURE_ARGS+=	--enable-shared
 CONFIGURE_ARGS+=	--enable-threads=${THREAD_MODEL}
 CONFIGURE_ARGS+=	--disable-bootstrap
+CONFIGURE_ARGS+=	--disable-libquadmath
 CONFIGURE_ARGS+=	--disable-libmudflap
 CONFIGURE_ARGS+=	--disable-libgomp
 CONFIGURE_ARGS+=	--disable-libssp
 CONFIGURE_ARGS+=	--disable-nls
 
 
-# The standard make options
-MAKE_ARGS=		MAKEINFOFLAGS="--no-split"
-
-
 # Automatic package list generation
 # lib/libquadmath.* will have to be added if __float128 support is added
 # Alternatively, libquadmath support could be intentionally disabled.
@@ -165,9 +164,14 @@ GENERATE_PLIST+= ${FIND} bin/gnat* | ${SORT};
 GENERATE_PLIST+= ${FIND} bin/${BLD_TARGET}* | ${SORT};
 GENERATE_PLIST+= ${FIND} lib/libiberty.a;
 GENERATE_PLIST+= ${FIND} lib/libgcc_s.* \( -type f -or -type l \) | ${SORT};
+.if !empty(PKG_OPTIONS:Mcxx)
+GENERATE_PLIST+= ${FIND} lib/libsupc++.* \( -type f -or -type l \) | ${SORT};
+GENERATE_PLIST+= ${FIND} lib/libstdc++.* \( -type f -or -type l \) | ${SORT};
+GENERATE_PLIST+= ${FIND} include/c++/${GCC_BRANCH}.${GCC_POINT}/* -type f | ${SORT} -dr;
+GENERATE_PLIST+= ${FIND} share/gcc-${GCC_BRANCH}.${GCC_POINT}/*   -type f | ${SORT} -dr;
+.endif
 GENERATE_PLIST+= ${FIND} ${LPATH}/*     \( -type f -or -type l \) | ${SORT} -dr;
 GENERATE_PLIST+= ${FIND} ${LEPATH}/*    -type f | ${SORT} -dr;
-GENERATE_PLIST+= ${FIND} ${SINFO}/gnat* -type f | ${SORT};
 GENERATE_PLIST+= ${FIND} ${SMAN1}/gnat* -type f | ${SORT};
 .for k in ${MAN7}
 GENERATE_PLIST+= ${FIND} ${SMAN7}/${k};
@@ -218,15 +222,28 @@ do-build:
 
 
 do-test: build
+.if !empty(PKG_OPTIONS:Mtestada)
+.if (${OPSYS} == "NetBSD") && (${MACHINE_ARCH} == "x86_64")
+	#NetBSD has an exremely small default stacksize of 2MB, which is insufficient
+	#for the gnat.dg testsuite (entry_queues test on AMD64 specifically)
+	cd ${WRKSRC} && \
+	${ULIMIT_CMD_stacksize} && \
+	${SETENV} ${MY_MAKE_ENV} ${GMAKE} -sk check-ada
+.else
 	cd ${WRKSRC} && ${SETENV} ${MY_MAKE_ENV} ${GMAKE} -sk check-ada
+.endif
+.endif
+.if !empty(PKG_OPTIONS:Mtestcxx)
+	cd ${WRKSRC} && ${SETENV} ${MY_MAKE_ENV} ${GMAKE} -sk check-c++
+	cd ${WRKSRC} && ${SETENV} ${MY_MAKE_ENV} ${GMAKE} -sk check-target-libstdc++-v3
+.endif
+.if !empty(PKG_OPTIONS:Mtestgcc)
+	cd ${WRKSRC} && ${SETENV} ${MY_MAKE_ENV} ${GMAKE} -sk check-c
+.endif
 
 
 do-install:
-	cd ${WRKSRC} && ${SETENV} ${MY_MAKE_ENV} ${GMAKE} install
-	${STRIP} ${PREFIX}/bin/gnat*
-.for k in ${LELIST}
-	${STRIP} ${PREFIX}/${LEPATH}/${k}
-.endfor
+	cd ${WRKSRC} && ${SETENV} ${MY_MAKE_ENV} ${GMAKE} install-strip
 
 
 
diff --git a/lang/gnat-aux/distinfo b/lang/gnat-aux/distinfo
index 76a22f1b412..6ab2d94eff4 100644
--- a/lang/gnat-aux/distinfo
+++ b/lang/gnat-aux/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2011/02/10 10:52:25 drochner Exp $
+$NetBSD: distinfo,v 1.3 2011/05/10 13:46:22 drochner Exp $
 
-SHA1 (gnat-aux-20110203.tar.bz2) = 2ddf38e21181649d68ca06deef5c1802828a80b0
-RMD160 (gnat-aux-20110203.tar.bz2) = 81e8c810278ac2c7d900fde28c70a5659f2dcfd0
-Size (gnat-aux-20110203.tar.bz2) = 23282877 bytes
+SHA1 (gnat-aux-20110325.tar.bz2) = 1a5889f74dedd56a721cb5b6f3372e9c28e9e7c1
+RMD160 (gnat-aux-20110325.tar.bz2) = 8440ae75906ecd97621872a7cbde02c6490118e0
+Size (gnat-aux-20110325.tar.bz2) = 26700051 bytes
 SHA1 (gnat-bootstrap.i386.dragonfly.tar.bz2) = d7a8103243a2df3723d9d3c3ec0da9c3bb725214
 RMD160 (gnat-bootstrap.i386.dragonfly.tar.bz2) = 9e6fde444e0ed76ee404810af6d6b7eb48659c09
 Size (gnat-bootstrap.i386.dragonfly.tar.bz2) = 28205489 bytes
diff --git a/lang/gnat-aux/options.mk b/lang/gnat-aux/options.mk
new file mode 100644
index 00000000000..21ba704286b
--- /dev/null
+++ b/lang/gnat-aux/options.mk
@@ -0,0 +1,36 @@
+# $NetBSD: options.mk,v 1.1 2011/05/10 13:46:22 drochner Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.gnat-aux
+PKG_SUPPORTED_OPTIONS=	ada cxx testada testcxx testgcc
+PKG_SUGGESTED_OPTIONS=	ada #cxx
+
+.include "../../mk/bsd.options.mk"
+
+
+#########################
+##  ADD LANGUAGE: Ada  ##
+#########################
+
+.if !empty(PKG_OPTIONS:Mada)
+LANGS+= ada
+.endif
+
+
+#########################
+##  ADD LANGUAGE: C++  ##
+#########################
+
+.if !empty(PKG_OPTIONS:Mcxx)
+LANGS+= c++
+.endif
+
+
+#########################
+##  TESTSUITE SUPPORT  ##
+#########################
+
+.if !empty(PKG_OPTIONS:Mtestada) \
+ || !empty(PKG_OPTIONS:Mtestcxx) \
+ || !empty(PKG_OPTIONS:Mtestgcc)
+BUILD_DEPENDS+= dejagnu>=1.4:../../devel/dejagnu
+.endif