diff options
author | Gerald Pfeifer <gerald@FreeBSD.org> | 2012-09-30 12:27:33 +0000 |
---|---|---|
committer | Gerald Pfeifer <gerald@FreeBSD.org> | 2012-09-30 12:27:33 +0000 |
commit | 8fbf5398c14af01a84d4a195c7209b4a6bbf425e (patch) | |
tree | 47c8ec0e30849a5903ef1133e00f5e0e6f4bfb7d /lang | |
parent | - Update to 0.22 [1] (diff) |
Forward port revision 282369 [1] which carried the following description:
On the way rename %%GCC_VER%% in pkg-plist to %%GCC_VERSION%% and
make the Makefile machinery a bit more generic to minimize differences
between lang/gcc ports based on releases and those based on snapshots.
On the way, update to the 20120929 snapshot of GCC 4.7.3.
Submitted by: jkim [1]
Notes
Notes:
svn path=/head/; revision=305077
Diffstat (limited to 'lang')
-rw-r--r-- | lang/gcc47/Makefile | 7 | ||||
-rw-r--r-- | lang/gcc47/distinfo | 4 | ||||
-rw-r--r-- | lang/gcc47/pkg-plist | 26 |
3 files changed, 20 insertions, 17 deletions
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile index 64a842e8d060..4dba442b2866 100644 --- a/lang/gcc47/Makefile +++ b/lang/gcc47/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gcc -PORTVERSION= 4.7.3.20120922 +PORTVERSION= 4.7.3.20120929 CATEGORIES= lang java MASTER_SITES= ${MASTER_SITE_GCC} MASTER_SITE_SUBDIR= snapshots/${VERSIONSTRING} @@ -20,7 +20,10 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils BUILD_DEPENDS+= runtest:${PORTSDIR}/misc/dejagnu .endif +# 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/} +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 powerpc powerpc64 sparc64 @@ -73,7 +76,7 @@ CONFIGURE_ARGS+=--disable-nls \ 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 \ diff --git a/lang/gcc47/distinfo b/lang/gcc47/distinfo index f1972e845bbf..5236cf8cb17f 100644 --- a/lang/gcc47/distinfo +++ b/lang/gcc47/distinfo @@ -1,2 +1,2 @@ -SHA256 (gcc-4.7-20120922.tar.bz2) = fa2ab0924f10642a5ae4d9626d229fdf8830d2aa0ef91fb4584985aa34da1294 -SIZE (gcc-4.7-20120922.tar.bz2) = 78875317 +SHA256 (gcc-4.7-20120929.tar.bz2) = bd816447e81c422564ad2d98cd6255552f0f3ca1d335b43b2c2858f0d0f91efd +SIZE (gcc-4.7-20120929.tar.bz2) = 78873496 diff --git a/lang/gcc47/pkg-plist b/lang/gcc47/pkg-plist index 89db48ca89e3..52db8b983629 100644 --- a/lang/gcc47/pkg-plist +++ b/lang/gcc47/pkg-plist @@ -2,7 +2,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%% @@ -17,16 +17,16 @@ bin/gcc-ranlib%%SUFFIX%% bin/gcov%%SUFFIX%% bin/gfortran%%SUFFIX%% 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 -@dirrm share/gcc-%%GCC_VER%%/python/libstdcxx/v6 -@dirrm share/gcc-%%GCC_VER%%/python/libstdcxx -@dirrm share/gcc-%%GCC_VER%%/python -@dirrm share/gcc-%%GCC_VER%% +%%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 +@dirrm share/gcc-%%GCC_VERSION%%/python/libstdcxx/v6 +@dirrm share/gcc-%%GCC_VERSION%%/python/libstdcxx +@dirrm share/gcc-%%GCC_VERSION%%/python +@dirrm share/gcc-%%GCC_VERSION%% %%JAVA%%bin/%%GNU_HOST%%-gcj%%SUFFIX%% %%JAVA%%bin/aot-compile%%SUFFIX%% %%JAVA%%bin/gappletviewer%%SUFFIX%% @@ -50,8 +50,8 @@ share/gcc-%%GCC_VER%%/python/libstdcxx/v6/printers.py %%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%%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 |