svn commit: r352664 - in head/lang/gcc: . files

[Gerald Pfeifer]

Author: gerald
Date: Tue Apr 29 23:53:07 2014
New Revision: 352664
URL: http://svnweb.freebsd.org/changeset/ports/352664
QAT: https://qat.redports.org/buildarchive/r352664/

Log:
  Merge updates from lang/gcc47 (and similarly lang/gcc48):
  
   - Add pkg-message that references the need to use -Wl,-rpath=... . [1]
  
   - Replace USE_BZIP2 by USES=tar:bzip2.
  
   - No longer install rebuild-gcj-db47 (which requires bash among others)
     and its man page.
  
  Bump PORTREVISION.
  
  PR:		185902 [1]

Added:
  head/lang/gcc/files/pkg-message.in   (contents, props changed)
Modified:
  head/lang/gcc/Makefile
  head/lang/gcc/pkg-plist

Modified: head/lang/gcc/Makefile
==============================================================================
--- head/lang/gcc/Makefile	Tue Apr 29 23:45:55 2014	(r352663)
+++ head/lang/gcc/Makefile	Tue Apr 29 23:53:07 2014	(r352664)
@@ -3,6 +3,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.7.3
+PORTREVISION=	1
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	releases/gcc-${DISTVERSION}
@@ -31,9 +32,8 @@ DISTVERSION=	${PORTVERSION}
 GCC_VERSION=	${PORTVERSION:C/(.+)\.[0-9]{8}/\1/}
 SUFFIX=		${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
 ONLY_FOR_ARCHS=	amd64 i386 powerpc powerpc64 sparc64
-USES=		gmake iconv perl5
+USES=		gmake iconv perl5 tar:bzip2
 USE_BINUTILS=	yes
-USE_BZIP2=	yes
 USE_PERL5=	build
 SSP_UNSAFE=	yes
 
@@ -99,6 +99,8 @@ INFO=		gcc${SUFFIX}/cpp \
 INFO+=		gcc${SUFFIX}/libquadmath \
 		gcc${SUFFIX}/libitm
 #.endif
+SUB_FILES=	pkg-message
+SUB_LIST+=	TARGLIB=${TARGLIB}
 
 .if ${PORT_OPTIONS:MJAVA}
 ECJ_JAR=	${LOCALBASE}/share/java/ecj-4.5.jar
@@ -133,6 +135,8 @@ full-regression-test: build
 post-install:
 	${RM} -f ${STAGEDIR}${TARGLIB}/*.la
 	${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

Added: head/lang/gcc/files/pkg-message.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/gcc/files/pkg-message.in	Tue Apr 29 23:53:07 2014	(r352664)
@@ -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: head/lang/gcc/pkg-plist
==============================================================================
--- head/lang/gcc/pkg-plist	Tue Apr 29 23:45:55 2014	(r352663)
+++ head/lang/gcc/pkg-plist	Tue Apr 29 23:53:07 2014	(r352664)
@@ -52,7 +52,6 @@ share/gcc-%%GCC_VERSION%%/python/libstdc
 %%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%%man/man1/aot-compile%%SUFFIX%%.1.gz
 %%JAVA%%man/man1/gappletviewer%%SUFFIX%%.1.gz
@@ -75,7 +74,6 @@ share/gcc-%%GCC_VERSION%%/python/libstdc
 %%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/man1/rebuild-gcj-db%%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