summaryrefslogtreecommitdiffstats
path: root/lang
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2004-11-15 01:33:03 +0000
committerobrien <obrien@FreeBSD.org>2004-11-15 01:33:03 +0000
commitb8faaa35ae092260c0a4bbc7deeb5cd19ef31917 (patch)
tree717ae758891616e3cd09c3817d005861deaa38a9 /lang
parent3f216ded690beeacc34adf419bb5cec09e874083 (diff)
downloadFreeBSD-ports-b8faaa35ae092260c0a4bbc7deeb5cd19ef31917.zip
FreeBSD-ports-b8faaa35ae092260c0a4bbc7deeb5cd19ef31917.tar.gz
Don't install compiler binaries without a version in the file name.
Diffstat (limited to 'lang')
-rw-r--r--lang/gcc28/Makefile6
-rw-r--r--lang/gcc28/pkg-plist7
2 files changed, 6 insertions, 7 deletions
diff --git a/lang/gcc28/Makefile b/lang/gcc28/Makefile
index ffeb98d..eee04c8 100644
--- a/lang/gcc28/Makefile
+++ b/lang/gcc28/Makefile
@@ -37,6 +37,7 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsdaout${OSREL}
PLIST_SUB= GNUHOST=${CONFIGURE_TARGET}
CONFIGURE_ARGS= --with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/2.8.1/include/g++
+CONFIGURE_ARGS+= --program-suffix=28
GNU_CONFIGURE= yes
USE_GMAKE= yes
ALL_TARGET= bootstrap
@@ -74,8 +75,9 @@ post-install:
${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/2.8.1/cpp ; \
do ${STRIP_CMD} $$prog ; \
done)
- ${LN} -f ${PREFIX}/bin/gcc ${PREFIX}/bin/gcc28
- ${LN} -f ${PREFIX}/bin/g++ ${PREFIX}/bin/g++28
+ @${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/gcc28
+ @${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/g++28
+ @${MV} ${PREFIX}/bin/gcov ${PREFIX}/bin/gcov28
@${MV} ${PREFIX}/man/man1/cccp.1 ${PREFIX}/man/man1/cccp28.1
@${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/g++28.1
@${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/gcc28.1
diff --git a/lang/gcc28/pkg-plist b/lang/gcc28/pkg-plist
index 024ebff..6bc89a7 100644
--- a/lang/gcc28/pkg-plist
+++ b/lang/gcc28/pkg-plist
@@ -1,11 +1,9 @@
@comment $FreeBSD$
-bin/g++
bin/g++28
+bin/gcov28
+bin/gcc28
bin/protoize
bin/unprotoize
-bin/gcov
-bin/gcc
-bin/gcc28
bin/%%GNUHOST%%-gcc
@unexec install-info --delete %D/info/cpp.info %D/info/dir
@unexec install-info --delete %D/info/gcc.info %D/info/dir
@@ -44,7 +42,6 @@ info/gcc.info-8
info/gcc.info-9
@exec install-info %D/info/cpp.info %D/info/dir
@exec install-info %D/info/gcc.info %D/info/dir
-lib/gcc-lib/%%GNUHOST%%/2.8.1/include/float.h
lib/gcc-lib/%%GNUHOST%%/2.8.1/include/math.h
lib/gcc-lib/%%GNUHOST%%/2.8.1/include/syslimits.h
lib/gcc-lib/%%GNUHOST%%/2.8.1/include/typeinfo
OpenPOWER on IntegriCloud