From: Jon Trulson <jon@radscan.com>
Date: Mon, 10 Mar 2014 23:06:24 +0000 (-0600)
Subject: dtdocbook/instant: *always* link with local libtcl.a
X-Git-Tag: 2.2.2~57
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=362a921245b7aee3214bf4d4d1df117e7dccfd08;p=oweals%2Fcde.git

dtdocbook/instant: *always* link with local libtcl.a

On some systems with libtcl installed, it might be linked into instant
rather than the locally provided version.  This can result in random
coredumps.

Seen on Ubuntu 12.04, x86_64.

Now, we force linking with ../tcl/libtcl.a.
---

diff --git a/cde/programs/dtdocbook/instant/Imakefile b/cde/programs/dtdocbook/instant/Imakefile
index 02a322a3..276492ed 100644
--- a/cde/programs/dtdocbook/instant/Imakefile
+++ b/cde/programs/dtdocbook/instant/Imakefile
@@ -5,7 +5,7 @@ XLATESRC  = $(DTSVCSRC)/DtUtil2
 INCLUDES = -I../lib/tptregexp -I../tcl -I$(XLATESRC)
 DEPLIBS = $(DEPDTSVCLIB)
 LOCAL_LIBRARIES = $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XLIB) \
--L../lib/tptregexp -ltptregexp -L../tcl -ltcl
+-L../lib/tptregexp -ltptregexp ../tcl/libtcl.a
 #if defined(SunArchitecture) || defined (UXPArchitecture) || defined(USLArchitecture)
 EXTRA_LIBRARIES = -lsocket -lnsl -lgen -lm
 #else