diff options
| author | gerald <gerald@FreeBSD.org> | 2011-09-25 22:58:08 +0800 |
|---|---|---|
| committer | gerald <gerald@FreeBSD.org> | 2011-09-25 22:58:08 +0800 |
| commit | e5cfe7554656b5ddebd24975ece0d4d4658e8d90 (patch) | |
| tree | 301530881b2f7bdaf800979a17662ed2d925a81f | |
| parent | ceb84227f3dc948c948a2cab2a3bb38227914e8f (diff) | |
| download | freebsd-ports-gnome-e5cfe7554656b5ddebd24975ece0d4d4658e8d90.tar.gz freebsd-ports-gnome-e5cfe7554656b5ddebd24975ece0d4d4658e8d90.tar.zst freebsd-ports-gnome-e5cfe7554656b5ddebd24975ece0d4d4658e8d90.zip | |
Prepare for the inclusion of lang/gcc, which is going to track our
preferred version of GCC (usually based on a release) starting with
GCC 4.6.1, and add a proper CONFLICTS.
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.
PR: 156857
| -rw-r--r-- | lang/gcc46/Makefile | 7 | ||||
| -rw-r--r-- | lang/gcc46/pkg-plist | 26 |
2 files changed, 19 insertions, 14 deletions
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile index 52e29f31f5dc..6ac88f3db347 100644 --- a/lang/gcc46/Makefile +++ b/lang/gcc46/Makefile @@ -25,7 +25,12 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils BUILD_DEPENDS+= runtest:${PORTSDIR}/misc/dejagnu .endif +CONFLICTS= gcc-4.6.1* + +# 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 ia64 powerpc sparc64 @@ -75,7 +80,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/gcc46/pkg-plist b/lang/gcc46/pkg-plist index d9851de1fd80..c43d639a499d 100644 --- a/lang/gcc46/pkg-plist +++ b/lang/gcc46/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%%-gfortran%%SUFFIX%% bin/c++%%SUFFIX%% bin/cpp%%SUFFIX%% @@ -11,16 +11,16 @@ bin/gcc%%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%% @@ -45,8 +45,8 @@ share/gcc-%%GCC_VER%%/python/libstdcxx/v6/printers.py %%JAVA%%bin/rebuild-gcj-db%%SUFFIX%% %%JAVA%%libdata/pkgconfig/libgcj-4.6.pc %%JAVA%%share/java/ecj.jar -%%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 |