diff options
| author | Gerald Pfeifer <gerald@FreeBSD.org> | 2014-04-30 07:53:07 +0800 |
|---|---|---|
| committer | Gerald Pfeifer <gerald@FreeBSD.org> | 2014-04-30 07:53:07 +0800 |
| commit | 84c431b34d137662ab81f6639631a486e98107a9 (patch) | |
| tree | 876a11e417338cf1758f66ec830db5c757ee735b /lang/gcc | |
| parent | 635ab19f96bf3b1b86fea417b3bf3fea6f8ca3ab (diff) | |
| download | freebsd-ports-gnome-84c431b34d137662ab81f6639631a486e98107a9.tar.gz freebsd-ports-gnome-84c431b34d137662ab81f6639631a486e98107a9.tar.zst freebsd-ports-gnome-84c431b34d137662ab81f6639631a486e98107a9.zip | |
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]
Diffstat (limited to 'lang/gcc')
| -rw-r--r-- | lang/gcc/Makefile | 8 | ||||
| -rw-r--r-- | lang/gcc/files/pkg-message.in | 7 | ||||
| -rw-r--r-- | lang/gcc/pkg-plist | 2 |
3 files changed, 13 insertions, 4 deletions
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile index 2cdd83ba0472..5e3defce855d 100644 --- a/lang/gcc/Makefile +++ b/lang/gcc/Makefile @@ -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 diff --git a/lang/gcc/files/pkg-message.in b/lang/gcc/files/pkg-message.in new file mode 100644 index 000000000000..433c37a3f89b --- /dev/null +++ b/lang/gcc/files/pkg-message.in @@ -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. diff --git a/lang/gcc/pkg-plist b/lang/gcc/pkg-plist index 0c067e997773..3dbd4b3602e4 100644 --- a/lang/gcc/pkg-plist +++ b/lang/gcc/pkg-plist @@ -52,7 +52,6 @@ share/gcc-%%GCC_VERSION%%/python/libstdcxx/v6/printers.py %%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/libstdcxx/v6/printers.py %%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 |