1From d6155ec08b355d64f1a7db407254d159037bb72a Mon Sep 17 00:00:00 2001
2From: Richard Purdie <rpurdie@linux.intel.com>
3Date: Wed, 9 Dec 2009 23:59:44 +0000
4Subject: [PATCH] tcl: Add tcltk from OE.dev but with legacy staging function
5
6Upstream-Status: Pending
7
8---
9 unix/Makefile.in | 5 ++++-
10 unix/tcl.m4      | 3 +++
11 2 files changed, 7 insertions(+), 1 deletion(-)
12
13diff --git a/unix/Makefile.in b/unix/Makefile.in
14index 398afd0..804532e 100644
15--- a/unix/Makefile.in
16+++ b/unix/Makefile.in
17@@ -893,7 +893,10 @@ install-binaries: binaries
18 	done
19 	@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
20 	@@INSTALL_LIB@
21-	@chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)"
22+	mv "$(DLL_INSTALL_DIR)"/$(LIB_FILE) "$(DLL_INSTALL_DIR)"/$(LIB_FILE).0
23+	ln -sf $(LIB_FILE).0 "$(DLL_INSTALL_DIR)"/$(LIB_FILE)
24+	ln -sf "$(DLL_INSTALL_DIR)"/$(LIB_FILE).0 ./
25+	@chmod 555 "$(DLL_INSTALL_DIR)"/$(LIB_FILE).0
26 	@echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}"
27 	@$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}"
28 	@echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/"
29diff --git a/unix/tcl.m4 b/unix/tcl.m4
30index f3d08ec..797c93f 100644
31--- a/unix/tcl.m4
32+++ b/unix/tcl.m4
33@@ -1382,6 +1382,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
34 	    # get rid of the warnings.
35 	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
36
37+	    # following line added by CW for Debian GNU/Linux
38+	    TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\${TCL_LIB_FILE}.0"
39+
40 	    SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared'
41 	    DL_OBJS="tclLoadDl.o"
42 	    DL_LIBS="-ldl"
43