diff options
| author | gerald <gerald@FreeBSD.org> | 2004-01-18 07:37:46 +0800 |
|---|---|---|
| committer | gerald <gerald@FreeBSD.org> | 2004-01-18 07:37:46 +0800 |
| commit | 5fb10770c1ea682e3db0e4601d73dbbecedcbfc0 (patch) | |
| tree | 43ba0b538b2e396fcbad802162e8abd46dbde9a4 /lang | |
| parent | 45e28cb6afecd2d95d27d4610117eea7224e3de6 (diff) | |
| download | freebsd-ports-gnome-5fb10770c1ea682e3db0e4601d73dbbecedcbfc0.tar.gz freebsd-ports-gnome-5fb10770c1ea682e3db0e4601d73dbbecedcbfc0.tar.zst freebsd-ports-gnome-5fb10770c1ea682e3db0e4601d73dbbecedcbfc0.zip | |
Configure with --program-suffix and make related and further simplifications.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/gcc33/Makefile | 29 | ||||
| -rw-r--r-- | lang/gcc33/pkg-plist | 6 |
2 files changed, 14 insertions, 21 deletions
diff --git a/lang/gcc33/Makefile b/lang/gcc33/Makefile index 31e24bbad76b..ce242b7b193c 100644 --- a/lang/gcc33/Makefile +++ b/lang/gcc33/Makefile @@ -60,10 +60,9 @@ GNU_CONFIGURE= yes USE_GMAKE= yes USE_BISON= yes CONFIGURE_ARGS= --disable-nls \ + --with-system-zlib \ + --program-suffix=33 \ --with-gxx-include-dir=${TARGLIB}/include/c++/ -#CONFIGURE_ARGS+= --program-suffix=33 -# Java -CONFIGURE_ARGS+= --with-system-zlib MAKE_ARGS+= MAKEINFOFLAGS="--no-split" .if defined(WANT_SHAREDLIBS) CONFIGURE_ARGS+= --enable-shared @@ -122,37 +121,29 @@ check: build cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check post-install: - @${RM} -f ${PREFIX}/bin/c++ ${PREFIX}/bin/${CONFIGURE_TARGET}-c++ @(for prog in \ ${TARGLIB}/cc1 ${TARGLIB}/cc1obj ${TARGLIB}/cc1plus \ ${TARGLIB}/collect2 ${TARGLIB}/f771 ; \ do \ ${STRIP_CMD} $$prog ; \ done ) -.for f in gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry +.for f in c++ f77 gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry # gij and jv-convert, for example, are not built on all platforms. - if [ -e ${PREFIX}/bin/${f} ]; then \ - ${STRIP_CMD} ${PREFIX}/bin/${f}; \ - fi - ${MV} -f ${PREFIX}/bin/${f} ${PREFIX}/bin/${f}33 - ( ${TEST} ! -e ${PREFIX}/man/man1/${f}.1 \ - || ${MV} -f ${PREFIX}/man/man1/${f}.1 \ - ${PREFIX}/man/man1/${f}33.1 ) -.endfor -.for f in g77 - ${MV} -f ${PREFIX}/bin/${f} ${PREFIX}/bin/${f}-33 - ( ${TEST} ! -e ${PREFIX}/man/man1/${f}.1 \ + if [ -e ${PREFIX}/bin/${f}33 ]; then \ + ${STRIP_CMD} ${PREFIX}/bin/${f}33; \ + ( ${TEST} ! -e ${PREFIX}/man/man1/${f}.1 \ || ${MV} -f ${PREFIX}/man/man1/${f}.1 \ - ${PREFIX}/man/man1/${f}-33.1 ) + ${PREFIX}/man/man1/${f}33.1 ); \ + fi .endfor - ${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug33 + ${MV} -f ${PREFIX}/bin/g7733 ${PREFIX}/bin/g77-33 + ${MV} -f ${PREFIX}/man/man1/g7733.1 ${PREFIX}/man/man1/g77-33.1 # These libraries are moved from PREFIX/lib to avoid conflicts with # the stock compiler. .for f in libstdc++ libsupc++ libg2c libfrtbegin libobjc ${EXTRA_SHLIB} ${MV} -f ${PREFIX}/lib/${f}.* ${TARGLIB} .endfor -${MV} -f ${PREFIX}/lib/ieee ${TARGLIB} - # Java -${MV} -f ${PREFIX}/lib/libgcj.* ${TARGLIB} ${RM} -f ${PREFIX}/lib/libiberty.a ${RM} -f ${TARGLIB}/*.la diff --git a/lang/gcc33/pkg-plist b/lang/gcc33/pkg-plist index e04fbe44378e..de39e9d33e48 100644 --- a/lang/gcc33/pkg-plist +++ b/lang/gcc33/pkg-plist @@ -1,13 +1,15 @@ @comment $FreeBSD$ +bin/c++33 bin/cpp33 bin/g++33 bin/g77-33 bin/gcc33 bin/gcov33 +bin/%%GNU_HOST%%-c++33 bin/%%GNU_HOST%%-gcc-%%GCC_VER%% bin/%%GNU_HOST%%-gcc33 bin/%%GNU_HOST%%-g++33 -bin/%%GNU_HOST%%-gcj +bin/%%GNU_HOST%%-gcj33 bin/gccbug33 bin/gcj33 bin/gcjh33 @@ -19,7 +21,7 @@ bin/jar33 bin/grepjar33 bin/rmic33 bin/rmiregistry33 -bin/addr2name.awk +bin/addr2name.awk33 include/fficonfig.h include/ffi.h include/ffi_mips.h |