diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 2000-12-05 21:36:59 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 2000-12-05 21:36:59 +0000 |
| commit | 76a9878ebce0e78ddc0192b72d842b62292ef5d7 (patch) | |
| tree | 2d858ee0e7d29e82c26860a491844b82e6dbd7a7 /lang/gcc32 | |
| parent | 3d3c68d7e4f307824eb21793fcfb7a787be36845 (diff) | |
| download | ports-76a9878ebce0e78ddc0192b72d842b62292ef5d7.tar.gz ports-76a9878ebce0e78ddc0192b72d842b62292ef5d7.zip | |
Notes
Diffstat (limited to 'lang/gcc32')
| -rw-r--r-- | lang/gcc32/Makefile | 27 | ||||
| -rw-r--r-- | lang/gcc32/pkg-plist | 8 |
2 files changed, 17 insertions, 18 deletions
diff --git a/lang/gcc32/Makefile b/lang/gcc32/Makefile index 41832fb0d06b..fa6b2fc6a0ae 100644 --- a/lang/gcc32/Makefile +++ b/lang/gcc32/Makefile @@ -34,7 +34,6 @@ NO_CDROM= 'dated material' ##INSTALL_WRKSRC= ${WRKDIR}/build ##CONFIGURE_SCRIPT= ${WRKSRC}/configure EGCS_REV= 2.97 -LIBSTDCPP_REV= 4 SRCDIR= ${WRKDIR}/gcc-${SNAPVER} WRKSRC= ${WRKDIR}/build PATCH_ARGS= -d ${SRCDIR} -E ${PATCH_STRIP} @@ -52,7 +51,7 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsdaout${OSREL} .endif PLIST_SUB= EGCS_REV=${EGCS_REV} GNU_HOST=${CONFIGURE_TARGET} \ - LIBSTDCPP_REV=${LIBSTDCPP_REV} SNAPVER=${SNAPVER} + SNAPVER=${SNAPVER} GNU_CONFIGURE= yes USE_GMAKE= yes USE_BISON= yes @@ -60,6 +59,8 @@ CONFIGURE_ARGS= --disable-nls --with-gnu-as --with-gnu-ld \ --with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/include/g++ .if defined(WANT_SHAREDLIBS) CONFIGURE_ARGS+= --enable-shared +.else +CONFIGURE_ARGS+= --disable-shared .endif .if defined(WANT_THREADS_SUPPORT) CONFIGURE_ARGS+= --enable-threads @@ -67,7 +68,7 @@ CONFIGURE_ARGS+= --enable-threads CONFIGURE_ARGS+= --enable-threads=posix .endif ALL_TARGET= bootstrap -MAN1= ecpp.1 eg++.1 eg77.1 egcc.1 +MAN1= gcpp.1 gg++.1 gg77.1 ggcc.1 pre-configure: @(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \ @@ -102,10 +103,10 @@ post-install: do \ strip $$prog ; \ done ) - ${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc - ${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++ - ${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/eg77 - ${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/eg++filt + ${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/ggcc + ${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/gg++ + ${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/gg77 + ${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/gg++filt ${MV} ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${SNAPVER} ${RM} -f ${PREFIX}/bin/${GNU_HOST}-c++ ${RM} -f ${PREFIX}/bin/cpp @@ -113,16 +114,14 @@ post-install: # with the stock compiler. ${MV} ${PREFIX}/lib/libiberty.a \ ${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV} - ${MV} -f ${PREFIX}/lib/libstdc++.a.${LIBSTDCPP_REV} \ + ${MV} -f ${PREFIX}/lib/libstdc++.a \ ${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV} - cd ${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV} ; \ - ${LN} -sf libstdc++.a.${LIBSTDCPP_REV} libstdc++.a ${MV} -f ${PREFIX}/lib/libzgcj.* \ ${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV} - ${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/egcc.1 - ${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/eg++.1 - ${MV} ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/eg77.1 - ${MV} ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/ecpp.1 + ${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/ggcc.1 + ${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1 + ${MV} ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1 + ${MV} ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1 .if defined(WANT_SHAREDLIBS) ${MV} -f ${PREFIX}/lib/libstdc++.so* \ ${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV} diff --git a/lang/gcc32/pkg-plist b/lang/gcc32/pkg-plist index 937fbde90edf..264f8e69036e 100644 --- a/lang/gcc32/pkg-plist +++ b/lang/gcc32/pkg-plist @@ -1,8 +1,8 @@ @comment $FreeBSD$ -bin/eg++filt -bin/eg++ -bin/eg77 -bin/egcc +bin/gg++filt +bin/gg++ +bin/gg77 +bin/ggcc bin/%%GNU_HOST%%-gcc bin/%%GNU_HOST%%-g++ bin/gccbug-%%SNAPVER%% |