Configure with --program-suffix and make related and further simplifications.

This commit is contained in:
Gerald Pfeifer 2004-01-17 23:37:46 +00:00
parent e0c097a049
commit 9eb0382f5a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=98429
2 changed files with 14 additions and 21 deletions

View file

@ -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}; \
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 ); \
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 \
|| ${MV} -f ${PREFIX}/man/man1/${f}.1 \
${PREFIX}/man/man1/${f}-33.1 )
.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

View file

@ -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