mirror of
git://git.yoctoproject.org/poky
synced 2026-10-30 08:50:43 +00:00
Alexander Kanavin
6a4296d252
Upstream submission should be done for tcl 9.x patches. (From OE-Core rev: 2671c3183a74617e79f6879b228f2df8055397fb) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
43 lines
1.7 KiB
Diff
43 lines
1.7 KiB
Diff
From 0d8e567d132e050c5d4a8d8d9257417e0679483c Mon Sep 17 00:00:00 2001
|
|
From: Richard Purdie <rpurdie@linux.intel.com>
|
|
Date: Wed, 9 Dec 2009 23:59:44 +0000
|
|
Subject: [PATCH] tcl: Add tcltk from OE.dev but with legacy staging function
|
|
|
|
Upstream-Status: Inappropriate [tcl 8.x is obsolete; upstream submission should be for 9.x patches]
|
|
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
|
|
---
|
|
unix/Makefile.in | 5 ++++-
|
|
unix/tcl.m4 | 3 +++
|
|
2 files changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/unix/Makefile.in b/unix/Makefile.in
|
|
index bc743b3..a2f9e21 100644
|
|
--- a/unix/Makefile.in
|
|
+++ b/unix/Makefile.in
|
|
@@ -812,7 +812,10 @@ install-binaries: binaries
|
|
done
|
|
@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
|
|
@@INSTALL_LIB@
|
|
- @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)"
|
|
+ mv "$(DLL_INSTALL_DIR)"/$(LIB_FILE) "$(DLL_INSTALL_DIR)"/$(LIB_FILE).0
|
|
+ ln -sf $(LIB_FILE).0 "$(DLL_INSTALL_DIR)"/$(LIB_FILE)
|
|
+ ln -sf "$(DLL_INSTALL_DIR)"/$(LIB_FILE).0 ./
|
|
+ @chmod 555 "$(DLL_INSTALL_DIR)"/$(LIB_FILE).0
|
|
@echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}"
|
|
@$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}"
|
|
@echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/"
|
|
diff --git a/unix/tcl.m4 b/unix/tcl.m4
|
|
index 7f5464e..cd8d929 100644
|
|
--- a/unix/tcl.m4
|
|
+++ b/unix/tcl.m4
|
|
@@ -1378,6 +1378,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
|
|
# get rid of the warnings.
|
|
#CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
|
|
|
|
+ # following line added by CW for Debian GNU/Linux
|
|
+ TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\${TCL_LIB_FILE}.0"
|
|
+
|
|
SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared'
|
|
DL_OBJS="tclLoadDl.o"
|
|
DL_LIBS="-ldl"
|