diff options
| author | peter <peter@FreeBSD.org> | 1996-10-30 08:44:18 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1996-10-30 08:44:18 +0000 |
| commit | 67e8086945d2b9e69b75b910d6691c0064917805 (patch) | |
| tree | c9fed86f4ee9dcb5a18c910cb55436eaf1150424 /tools/tools | |
| parent | 0ddb96bd1e62a8fbdb72a3a0ddaf0584557a132a (diff) | |
| download | FreeBSD-src-67e8086945d2b9e69b75b910d6691c0064917805.zip FreeBSD-src-67e8086945d2b9e69b75b910d6691c0064917805.tar.gz | |
Argh, I hate the tcl build/config environment. :-(
It seems that some tools (eg: expect-5.21) use TCL_LIB_SPEC to generate
their shared library suffix. This should be .so.1.0, not .so as ld can't
use it.
Revert part of the previous change here, it did too much. libtcl75.so.1.1
was bumped, but the rules to generate library names for _other_ packages
were not supposed to be. Sigh.
Diffstat (limited to 'tools/tools')
| -rw-r--r-- | tools/tools/tcl_bmake/mkMakefile.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/tools/tcl_bmake/mkMakefile.sh b/tools/tools/tcl_bmake/mkMakefile.sh index 32b0a0d..dbb4536 100644 --- a/tools/tools/tcl_bmake/mkMakefile.sh +++ b/tools/tools/tcl_bmake/mkMakefile.sh @@ -1,5 +1,5 @@ #! /bin/sh -# $Id: mkMakefile.sh,v 1.13 1996/10/27 12:44:44 wosch Exp $ +# $Id: mkMakefile.sh,v 1.14 1996/10/29 04:31:21 peter Exp $ # # This script generates a bmake Makefile for src/lib/libtcl # @@ -45,7 +45,7 @@ echo '# # Please change src/tools/tools/tcl_bmake/mkMakefile.sh instead # # Generated by src/tools/tools/tcl_bmake/mkMakefile.sh version: -# $Id: mkMakefile.sh,v 1.13 1996/10/27 12:44:44 wosch Exp $ +# $Id: mkMakefile.sh,v 1.14 1996/10/29 04:31:21 peter Exp $ # ' | tr -d '$' >> ${LIBTCL}Makefile @@ -205,6 +205,7 @@ EOF sed < ${SRCDIR}/unix/tclConfig.sh > ${LIBTCL}/tclConfig.sh \ -e '/^TCL.*_LIB_SPEC=/s/-L.* //' \ - -e "s/1\.0/1.${SHLIB_MINOR}/" + -e "/libtcl/s/\.so\.1\.0/.so.1.${SHLIB_MINOR}/" \ + -e '/^TCL_SHLIB_SUFFIX=/s/\.so/.so.1.0/' rm -f m.x ${SRCDIR}/unix/config.log ${SRCDIR}/unix/Makefile ${SRCDIR}/unix/config.cache ${SRCDIR}/unix/config.status ${SRCDIR}/unix/tclConfig.sh |
