[Midnightbsd-cvs] mports [16953] trunk/lang/gcc47: gcc 4.7.4

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Sep 7 13:57:41 EDT 2014 

Revision: 16953
          http://svnweb.midnightbsd.org/mports/?rev=16953
Author:   laffer1
Date:     2014-09-07 13:57:40 -0400 (Sun, 07 Sep 2014)
Log Message:
-----------
gcc 4.7.4

Modified Paths:
--------------
    trunk/lang/gcc47/Makefile
    trunk/lang/gcc47/distinfo
    trunk/lang/gcc47/pkg-plist

Added Paths:
-----------
    trunk/lang/gcc47/files/patch-libcpp
    trunk/lang/gcc47/files/pkg-message.in

Modified: trunk/lang/gcc47/Makefile
===================================================================
--- trunk/lang/gcc47/Makefile	2014-09-07 17:53:36 UTC (rev 16952)
+++ trunk/lang/gcc47/Makefile	2014-09-07 17:57:40 UTC (rev 16953)
@@ -1,13 +1,13 @@
 # $MidnightBSD$
 # $FreeBSD: ports/lang/gcc47/Makefile,v 1.513 2011/11/15 11:46:26 gerald Exp $
 
-PORTNAME=	gcc
-PORTVERSION=	4.7.0.20111105
-PORTREVISION=	1
+PORTNAME=	gcc47
+PORTVERSION=	4.7.4
+PORTEPOCH=	1
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC}
-MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
-DISTNAME=	gcc-${VERSIONSTRING}
+MASTER_SITE_SUBDIR=	releases/gcc-${DISTVERSION}
+DISTNAME=	gcc-${DISTVERSION}
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	GNU Compiler Collection 4.7
@@ -14,9 +14,10 @@
 
 LICENSE=	gpl3
 
-LIB_DEPENDS=	gmp:${PORTSDIR}/math/gmp \
-		mpfr:${PORTSDIR}/math/mpfr \
-		mpc:${PORTSDIR}/math/mpc
+LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
+		libmpfr.so:${PORTSDIR}/math/mpfr \
+		libmpc.so:${PORTSDIR}/math/mpc
+BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
 RUN_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
 
 .if defined(MAINTAINER_MODE)
@@ -23,26 +24,31 @@
 BUILD_DEPENDS+=	runtest:${PORTSDIR}/misc/dejagnu
 .endif
 
-VERSIONSTRING=	${PORTVERSION:C/([0-9]+\.[0-9]+).*\.([0-9]+)/\1-\2/}
+CONFLICTS=	gcc-4.7.*
+
+# DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names
+# of executables and directories once installed.
+DISTVERSION=	${PORTVERSION}
+GCC_VERSION=	${PORTVERSION:C/(.+)\.[0-9]{8}/\1/}
 SUFFIX=		${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
-LATEST_LINK=	gcc${SUFFIX}${PKGNAMESUFFIX}
+ONLY_FOR_ARCHS=	amd64 i386 sparc64
+USES=		gmake iconv makeinfo perl5 tar:bzip2
 USE_BINUTILS=	yes
-USES=	gmake iconv
-USE_BISON=	build
-USE_BZIP2=	yes
-USE_PERL5_BUILD=yes
+USE_PERL5=	build
+SSP_UNSAFE=	yes
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:S/${WRKDIR}\///}/configure
 
-OPTIONS=	JAVA	"Enable the Java frontend (i386 and amd64 only)"	on
+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 <bsd.port.pre.mk>
 
-.if ${ARCH} != i386 && ${ARCH} != amd64
-WITHOUT_JAVA=	yes
-.endif
-
 .if ${ARCH} == "amd64"
 CONFIGURE_TARGET=	x86_64-portbld-freebsd9.1
 .else
@@ -49,14 +55,23 @@
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd9.1
 .endif
 
-SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
+.if ${ARCH} == powerpc64
+CONFIGURE_ENV+=	UNAME_m="powerpc64"
+.endif
+
+LANGUAGES:=	c,c++,objc,fortran
+SRCDIR=		${WRKDIR}/gcc-${DISTVERSION}
 WRKSRC=		${WRKDIR}/build
 TARGLIB=	${PREFIX}/lib/gcc${SUFFIX}
 LIBEXEC=	${PREFIX}/libexec/gcc${SUFFIX}
 GNU_CONFIGURE=	yes
-CFLAGS+=	-I${LOCALBASE}/include
+.if empty(PORT_OPTIONS:MBOOTSTRAP)
+CONFIGURE_ARGS+=--disable-bootstrap
+.else
+ALL_TARGET=	bootstrap-lean
+.endif
 CONFIGURE_ARGS+=--disable-nls \
-		--enable-languages=c,c++,fortran \
+		--enable-gnu-indirect-function \
 		--libdir=${TARGLIB} \
 		--libexecdir=${LIBEXEC} \
 		--program-suffix=${SUFFIX} \
@@ -64,70 +79,35 @@
 		--with-gmp=${LOCALBASE} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
 		--with-ld=${LOCALBASE}/bin/ld \
-		--with-libiconv-prefix=${LOCALBASE} \
-		--with-pkgversion="MidnightBSD Ports Collection" \
+		${ICONV_CONFIGURE_ARG} \
+		--with-pkgversion="FreeBSD Ports Collection" \
 		--with-system-zlib
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
-ALL_TARGET=	bootstrap-lean
 USE_LDCONFIG=	${TARGLIB}
-PLIST_SUB=	GCC_VER=${PORTVERSION:C/(.+)\.[0-9]+/\1/} \
+PLIST_SUB=	GCC_VERSION=${GCC_VERSION} \
 		GNU_HOST=${CONFIGURE_TARGET} \
 		SUFFIX=${SUFFIX}
-MAN1=		cpp${SUFFIX}.1 \
-		g++${SUFFIX}.1 \
-		gcc${SUFFIX}.1 \
-		gcov${SUFFIX}.1 \
-		gfortran${SUFFIX}.1
-#INFO=		gcc${SUFFIX}/cpp \
-#		gcc${SUFFIX}/cppinternals \
-#		gcc${SUFFIX}/gcc \
-#		gcc${SUFFIX}/gccinstall \
-#		gcc${SUFFIX}/gccint \
-#		gcc${SUFFIX}/gfortran \
-#		gcc${SUFFIX}/libgomp
-.if ${ARCH} != "sparc64"
-#INFO+=		gcc${SUFFIX}/libquadmath
-.endif
+# Release tarballs (as opposed to snapshots) always carry this.
+SUB_FILES=	pkg-message
+SUB_LIST+=	TARGLIB=${TARGLIB}
 
-.if ! defined(WITHOUT_JAVA)
-BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip
+.if ${PORT_OPTIONS:MJAVA}
+ECJ_JAR=	${LOCALBASE}/share/java/ecj-4.5.jar
+BUILD_DEPENDS+=	${ECJ_JAR}:${PORTSDIR}/lang/gcc-ecj45 \
+		zip:${PORTSDIR}/archivers/zip
+RUN_DEPENDS+=	${ECJ_JAR}:${PORTSDIR}/lang/gcc-ecj45
 EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
-CONFIGURE_ARGS+=--enable-languages=c,c++,fortran,java
-MAN1+=		aot-compile${SUFFIX}.1 \
-		gappletviewer${SUFFIX}.1 \
-		gc-analyze${SUFFIX}.1 \
-		gcj${SUFFIX}.1 \
-		gcj-dbtool${SUFFIX}.1 \
-		gcjh${SUFFIX}.1 \
-		gij${SUFFIX}.1 \
-		gjar${SUFFIX}.1 \
-		gjarsigner${SUFFIX}.1 \
-		gjavah${SUFFIX}.1 \
-		gjdoc${SUFFIX}.1 \
-		gkeytool${SUFFIX}.1 \
-		gnative2ascii${SUFFIX}.1 \
-		gorbd${SUFFIX}.1 \
-		grmic${SUFFIX}.1 \
-		grmid${SUFFIX}.1 \
-		grmiregistry${SUFFIX}.1 \
-		gserialver${SUFFIX}.1 \
-		gtnameserv${SUFFIX}.1 \
-		jcf-dump${SUFFIX}.1 \
-		jv-convert${SUFFIX}.1 \
-		rebuild-gcj-db${SUFFIX}.1
-MAN3=		ffi${SUFFIX}.3 \
-		ffi_call${SUFFIX}.3 \
-		ffi_prep_cif${SUFFIX}.3
-#INFO+=		gcc${SUFFIX}/cp-tools \
-#		gcc${SUFFIX}/gcj
+CONFIGURE_ARGS+=--with-ecj-jar=${ECJ_JAR}
+LANGUAGES:=	${LANGUAGES},java
 PLIST_SUB+=	JAVA=""
 .else
 CONFIGURE_ARGS+=--disable-libgcj
 PLIST_SUB+=	JAVA="@comment "
 .endif
+CONFIGURE_ARGS+=--enable-languages=${LANGUAGES}
 
 pre-everything::
-	@${ECHO_MSG} "Making GCC ${PORTVERSION} for ${OPSYS} ${OSREL}  target=${CONFIGURE_TARGET}"
+	@${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]"
 
 pre-configure:
 	cd ${SRCDIR} ; contrib/gcc_update --touch
@@ -136,17 +116,20 @@
 
 .if defined(MAINTAINER_MODE)
 full-regression-test: build
-	cd ${WRKSRC}; ${GMAKE} -sk check
+	cd ${WRKSRC}; ${MAKE_CMD} -sk check \
+	; ${SRCDIR}/contrib/test_summary
 .endif
 
 post-install:
-	${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \
-	         ${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7
-	${RM} -f ${TARGLIB}/*.la
+	${FIND} ${STAGEDIR}${TARGLIB} ${STAGEDIR}${LIBEXEC} \
+	        -name '*.la' | ${XARGS} ${RM}
+	${RM} -f ${STAGEDIR}${PREFIX}/man/man7/*
+	${RM} -f ${STAGEDIR}${PREFIX}/bin/rebuild-gcj-db${SUFFIX} \
+	         ${STAGEDIR}${PREFIX}/man/man1/rebuild-gcj-db${SUFFIX}.1
 	# Add target libraries and include files to packaging list.
 	${RM} -f ${WRKDIR}/PLIST.lib
 .for d in ${TARGLIB:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
-	cd ${PREFIX} ; if [ -d $d ]; then \
+	cd ${STAGEDIR}${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
 	    ${FIND} $d -type d | ${SORT} -r \
 	        | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\
@@ -153,13 +136,5 @@
 	fi
 .endfor
 	cd ${WRKDIR} ; ${SED} -i -e "/PLIST.lib/ r PLIST.lib" ${TMPPLIST}
-	@if type ccache-update-links >/dev/null 2>&1; then \
-	    ccache-update-links -v; \
-	fi
-.if ! defined(WITHOUT_JAVA)
-	${REINPLACE_CMD} -e 's|${PREFIX}|${LOCALBASE}|g' \
-		${FAKE_DESTDIR}${LOCALBASE}/bin/gjavah \
-		${FAKE_DESTDIR}${LOCALBASE}/bin/gjar
-.endif
 
 .include <bsd.port.post.mk>

Modified: trunk/lang/gcc47/distinfo
===================================================================
--- trunk/lang/gcc47/distinfo	2014-09-07 17:53:36 UTC (rev 16952)
+++ trunk/lang/gcc47/distinfo	2014-09-07 17:57:40 UTC (rev 16953)
@@ -1,3 +1,2 @@
-SHA256 (gcc-4.7-20111105.tar.bz2) = 59696e267462d2bc6f9830e10e54c6316721a874bf6a0aa1dad4522592f025da
-RMD160 (gcc-4.7-20111105.tar.bz2) = 6ac15c72d88b2d8d4ee07c9196af3047ecddf16a
-SIZE (gcc-4.7-20111105.tar.bz2) = 76281173
+SHA256 (gcc-4.7.4.tar.bz2) = 92e61c6dc3a0a449e62d72a38185fda550168a86702dea07125ebd3ec3996282
+SIZE (gcc-4.7.4.tar.bz2) = 82935453

Added: trunk/lang/gcc47/files/patch-libcpp
===================================================================
--- trunk/lang/gcc47/files/patch-libcpp	                        (rev 0)
+++ trunk/lang/gcc47/files/patch-libcpp	2014-09-07 17:57:40 UTC (rev 16953)
@@ -0,0 +1,10 @@
+--- libcpp/internal.h	2012-07-30 09:24:59.000000000 +0000
++++ libcpp/internal.h	2013-09-04 00:41:26.000000000 +0000
+@@ -27,6 +27,7 @@
+ #include "cpp-id-data.h"
+ 
+ #if HAVE_ICONV
++#define __bool_true_false_are_defined
+ #include <iconv.h>
+ #else
+ #define HAVE_ICONV 0

Added: trunk/lang/gcc47/files/pkg-message.in
===================================================================
--- trunk/lang/gcc47/files/pkg-message.in	                        (rev 0)
+++ trunk/lang/gcc47/files/pkg-message.in	2014-09-07 17:57:40 UTC (rev 16953)
@@ -0,0 +1,7 @@
+To ensure binaries built with this toolchain find appropriate versions
+of the necessary run-time libraries, you may want to link using
+
+  -Wl,-rpath=%%TARGLIB%%
+
+For ports leveraging USE_GCC, USES=compiler, or USES=fortran this happens
+transparently.

Modified: trunk/lang/gcc47/pkg-plist
===================================================================
--- trunk/lang/gcc47/pkg-plist	2014-09-07 17:53:36 UTC (rev 16952)
+++ trunk/lang/gcc47/pkg-plist	2014-09-07 17:57:40 UTC (rev 16953)
@@ -1,7 +1,7 @@
 bin/%%GNU_HOST%%-c++%%SUFFIX%%
 bin/%%GNU_HOST%%-g++%%SUFFIX%%
 bin/%%GNU_HOST%%-gcc%%SUFFIX%%
-bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
+bin/%%GNU_HOST%%-gcc-%%GCC_VERSION%%
 bin/%%GNU_HOST%%-gcc-ar%%SUFFIX%%
 bin/%%GNU_HOST%%-gcc-nm%%SUFFIX%%
 bin/%%GNU_HOST%%-gcc-ranlib%%SUFFIX%%
@@ -15,17 +15,21 @@
 bin/gcc-ranlib%%SUFFIX%%
 bin/gcov%%SUFFIX%%
 bin/gfortran%%SUFFIX%%
- at comment info/gcc%%SUFFIX%%/dir
-%%JAVA%%share/gcc-%%GCC_VER%%/python/libjava/aotcompile.py
-%%JAVA%%share/gcc-%%GCC_VER%%/python/libjava/classfile.py
-%%JAVA%%@dirrm share/gcc-%%GCC_VER%%/python/libjava
-share/gcc-%%GCC_VER%%/python/libstdcxx/__init__.py
-share/gcc-%%GCC_VER%%/python/libstdcxx/v6/__init__.py
-share/gcc-%%GCC_VER%%/python/libstdcxx/v6/printers.py
- at dirrm share/gcc-%%GCC_VER%%/python/libstdcxx/v6
- at dirrm share/gcc-%%GCC_VER%%/python/libstdcxx
- at dirrm share/gcc-%%GCC_VER%%/python
- at dirrm share/gcc-%%GCC_VER%%
+man/man1/cpp%%SUFFIX%%.1.gz
+man/man1/g++%%SUFFIX%%.1.gz
+man/man1/gcc%%SUFFIX%%.1.gz
+man/man1/gcov%%SUFFIX%%.1.gz
+man/man1/gfortran%%SUFFIX%%.1.gz
+%%JAVA%%share/gcc-%%GCC_VERSION%%/python/libjava/aotcompile.py
+%%JAVA%%share/gcc-%%GCC_VERSION%%/python/libjava/classfile.py
+%%JAVA%%@dirrm share/gcc-%%GCC_VERSION%%/python/libjava
+share/gcc-%%GCC_VERSION%%/python/libstdcxx/__init__.py
+share/gcc-%%GCC_VERSION%%/python/libstdcxx/v6/__init__.py
+share/gcc-%%GCC_VERSION%%/python/libstdcxx/v6/printers.py
+ at dirrm share/gcc-%%GCC_VERSION%%/python/libstdcxx/v6
+ at dirrm share/gcc-%%GCC_VERSION%%/python/libstdcxx
+ at dirrm share/gcc-%%GCC_VERSION%%/python
+ at dirrm share/gcc-%%GCC_VERSION%%
 %%JAVA%%bin/%%GNU_HOST%%-gcj%%SUFFIX%%
 %%JAVA%%bin/aot-compile%%SUFFIX%%
 %%JAVA%%bin/gappletviewer%%SUFFIX%%
@@ -47,10 +51,33 @@
 %%JAVA%%bin/gtnameserv%%SUFFIX%%
 %%JAVA%%bin/jcf-dump%%SUFFIX%%
 %%JAVA%%bin/jv-convert%%SUFFIX%%
-%%JAVA%%bin/rebuild-gcj-db%%SUFFIX%%
 %%JAVA%%libdata/pkgconfig/libgcj-4.7.pc
-%%JAVA%%share/java/libgcj-%%GCC_VER%%.jar
-%%JAVA%%share/java/libgcj-tools-%%GCC_VER%%.jar
+%%JAVA%%man/man1/aot-compile%%SUFFIX%%.1.gz
+%%JAVA%%man/man1/gappletviewer%%SUFFIX%%.1.gz
+%%JAVA%%man/man1/gc-analyze%%SUFFIX%%.1.gz
+%%JAVA%%man/man1/gcj%%SUFFIX%%.1.gz
+%%JAVA%%man/man1/gcj-dbtool%%SUFFIX%%.1.gz
+%%JAVA%%man/man1/gcjh%%SUFFIX%%.1.gz
+%%JAVA%%man/man1/gij%%SUFFIX%%.1.gz
+%%JAVA%%man/man1/gjar%%SUFFIX%%.1.gz
+%%JAVA%%man/man1/gjarsigner%%SUFFIX%%.1.gz
+%%JAVA%%man/man1/gjavah%%SUFFIX%%.1.gz
+%%JAVA%%man/man1/gjdoc%%SUFFIX%%.1.gz
+%%JAVA%%man/man1/gkeytool%%SUFFIX%%.1.gz
+%%JAVA%%man/man1/gnative2ascii%%SUFFIX%%.1.gz
+%%JAVA%%man/man1/gorbd%%SUFFIX%%.1.gz
+%%JAVA%%man/man1/grmic%%SUFFIX%%.1.gz
+%%JAVA%%man/man1/grmid%%SUFFIX%%.1.gz
+%%JAVA%%man/man1/grmiregistry%%SUFFIX%%.1.gz
+%%JAVA%%man/man1/gserialver%%SUFFIX%%.1.gz
+%%JAVA%%man/man1/gtnameserv%%SUFFIX%%.1.gz
+%%JAVA%%man/man1/jcf-dump%%SUFFIX%%.1.gz
+%%JAVA%%man/man1/jv-convert%%SUFFIX%%.1.gz
+%%JAVA%%man/man3/ffi%%SUFFIX%%.3.gz
+%%JAVA%%man/man3/ffi_call%%SUFFIX%%.3.gz
+%%JAVA%%man/man3/ffi_prep_cif%%SUFFIX%%.3.gz
+%%JAVA%%share/java/libgcj-%%GCC_VERSION%%.jar
+%%JAVA%%share/java/libgcj-tools-%%GCC_VERSION%%.jar
 @exec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi
 @unexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi
 @comment Insert PLIST.lib here

More information about the Midnightbsd-cvs mailing list