From owner-svn-ports-all@FreeBSD.ORG Mon May 13 00:23:03 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 7076AB68; Mon, 13 May 2013 00:23:03 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 61DA68AD; Mon, 13 May 2013 00:23:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4D0N3Gp045776; Mon, 13 May 2013 00:23:03 GMT (envelope-from gerald@svn.freebsd.org) Received: (from gerald@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4D0N3qa045774; Mon, 13 May 2013 00:23:03 GMT (envelope-from gerald@svn.freebsd.org) Message-Id: <201305130023.r4D0N3qa045774@svn.freebsd.org> From: Gerald Pfeifer Date: Mon, 13 May 2013 00:23:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317986 - head/lang/gcc46 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 May 2013 00:23:03 -0000 Author: gerald Date: Mon May 13 00:23:02 2013 New Revision: 317986 URL: http://svnweb.freebsd.org/changeset/ports/317986 Log: Update to GCC 4.6.4, the final release and end of the GCC 4.6 branch. (This requires an EPOCH bump due to how snapshots are labeled.) Introduce a new option BOOTSTRAP that allows for doing a full bootstrap of GCC, as opposed to just running a simple build. Bootstrapping is actually the default upstream, we disable it by default for the stable flavors of GCC since that is a huge win in terms of build time of the port. No change in default behavior for this port. Modified: head/lang/gcc46/Makefile head/lang/gcc46/distinfo Modified: head/lang/gcc46/Makefile ============================================================================== --- head/lang/gcc46/Makefile Mon May 13 00:08:14 2013 (r317985) +++ head/lang/gcc46/Makefile Mon May 13 00:23:02 2013 (r317986) @@ -2,11 +2,11 @@ # $FreeBSD$ PORTNAME= gcc -PORTVERSION= 4.6.4.20130215 +PORTVERSION= 4.6.4 +PORTEPOCH= 1 CATEGORIES= lang java MASTER_SITES= ${MASTER_SITE_GCC} -MASTER_SITE_SUBDIR= snapshots/${VERSIONSTRING} -DISTNAME= gcc-${VERSIONSTRING} +MASTER_SITE_SUBDIR= releases/gcc-${VERSIONSTRING} MAINTAINER= gerald@FreeBSD.org COMMENT= GNU Compiler Collection 4.6 @@ -25,7 +25,7 @@ CONFLICTS= gcc-4.6.[123]* # VERSIONSTRING relates to downloads, GCC_VERSION and SUFFIX to names # of executables and directories once installed. -VERSIONSTRING= ${PORTVERSION:C/([0-9]+\.[0-9]+).*\.([0-9]+)/\1-\2/} +VERSIONSTRING= ${PORTVERSION} GCC_VERSION= ${PORTVERSION:C/(.+)\.[0-9]{8}/\1/} SUFFIX= ${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/} LATEST_LINK= gcc${SUFFIX}${PKGNAMESUFFIX} @@ -40,10 +40,12 @@ MAKE_JOBS_SAFE= yes PATCH_WRKSRC= ${SRCDIR} CONFIGURE_SCRIPT= ../${SRCDIR:S/${WRKDIR}\///}/configure +OPTIONS_DEFINE= BOOTSTRAP OPTIONS_DEFINE_i386= JAVA OPTIONS_DEFINE_amd64= JAVA OPTIONS_DEFAULT_i386= JAVA OPTIONS_DEFAULT_amd64= JAVA +BOOTSTRAP_DESC= Build using a full bootstrap .include @@ -60,8 +62,10 @@ TARGLIB= ${PREFIX}/lib/gcc${SUFFIX} LIBEXEC= ${PREFIX}/libexec/gcc${SUFFIX} GNU_CONFIGURE= yes CFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ARGS+=--disable-bootstrap \ - --disable-nls \ +.if empty(PORT_OPTIONS:MBOOTSTRAP) +CONFIGURE_ARGS+=--disable-bootstrap +.endif +CONFIGURE_ARGS+=--disable-nls \ --libdir=${TARGLIB} \ --libexecdir=${LIBEXEC} \ --program-suffix=${SUFFIX} \ @@ -89,9 +93,10 @@ INFO= gcc${SUFFIX}/cpp \ gcc${SUFFIX}/gccint \ gcc${SUFFIX}/gfortran \ gcc${SUFFIX}/libgomp -.if ${ARCH} != "ia64" && ${ARCH} != "powerpc" && ${ARCH} != "sparc64" +# Release tarballs (as opposed to snapshots) always carry this. +#.if ${ARCH} != "ia64" && ${ARCH} != "powerpc" && ${ARCH} != "sparc64" INFO+= gcc${SUFFIX}/libquadmath -.endif +#.endif .if ${PORT_OPTIONS:MJAVA} ECJ_JAR= ${LOCALBASE}/share/java/ecj-4.5.jar Modified: head/lang/gcc46/distinfo ============================================================================== --- head/lang/gcc46/distinfo Mon May 13 00:08:14 2013 (r317985) +++ head/lang/gcc46/distinfo Mon May 13 00:23:02 2013 (r317986) @@ -1,2 +1,2 @@ -SHA256 (gcc-4.6-20130215.tar.bz2) = ba09fa687b5f55527952c11b588de359868a9257b7bf4271d1d575a441fd2f1a -SIZE (gcc-4.6-20130215.tar.bz2) = 68134979 +SHA256 (gcc-4.6.4.tar.bz2) = 35af16afa0b67af9b8eb15cafb76d2bc5f568540552522f5dc2c88dd45d977e8 +SIZE (gcc-4.6.4.tar.bz2) = 72006076