mirror of
https://git.FreeBSD.org/src.git
synced 2025-01-01 12:19:28 +00:00
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.
This commit is contained in:
parent
37bd2b301c
commit
6869793758
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=19263
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user