1 files changed, 29 insertions, 35 deletions

diff --git a/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch b/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch
index d3691f64fc..96276eab0e 100644
--- a/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch
+++ b/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch
@@ -2,29 +2,23 @@ Upstream-Status: Pending
 
 Index: unix/configure
 ===================================================================
---- unix.orig/configure 2013-09-19 23:17:13.000000000 +0300
-+++ unix/configure      2013-10-16 15:58:37.450136217 +0300
-@@ -6899,6 +6899,7 @@
-            LIBS="$LIBS -lc"
-            SHLIB_CFLAGS=""
-            SHLIB_SUFFIX=".so"
-+           SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.so.0'
+--- unix.orig/configure 2013-09-19 13:17:13.000000000 -0700
++++ unix/configure      2013-11-11 00:20:51.519490342 -0800
+@@ -7599,6 +7599,9 @@
+            # 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} -shared ${CFLAGS} ${LDFLAGS}'
             DL_OBJS="tclLoadDl.o"
-            LD_LIBRARY_PATH_VAR="LIBPATH"
+            DL_LIBS="-ldl"
 Index: unix/tcl.m4
 ===================================================================
---- unix.orig/tcl.m4    2013-09-19 23:17:13.000000000 +0300
-+++ unix/tcl.m4 2013-10-16 16:18:50.719586228 +0300
-@@ -1408,6 +1408,7 @@
-        Linux*|GNU*|NetBSD-Debian)
-            SHLIB_CFLAGS="-fPIC"
-            SHLIB_SUFFIX=".so"
-+           SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.0'
- 
-            CFLAGS_OPTIMIZE="-O2"
-            # egcs-2.91.66 on Redhat Linux 6.0 generates lots of warnings
-@@ -1415,12 +1416,15 @@
+--- unix.orig/tcl.m4    2013-09-19 13:17:13.000000000 -0700
++++ unix/tcl.m4 2013-11-11 00:17:24.263485123 -0800
+@@ -1415,6 +1415,9 @@
             # get rid of the warnings.
             #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
  
@@ -34,19 +28,19 @@ Index: unix/tcl.m4
             SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
             DL_OBJS="tclLoadDl.o"
             DL_LIBS="-ldl"
-            LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
-            AS_IF([test $doRpath = yes], [
--               CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
-+               CC_SEARCH_FLAGS=''])
-            LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
-            AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"])
-            AS_IF([test $do64bit = yes], [
-@@ -2050,7 +2054,7 @@
- 
-     AS_IF([test "${SHARED_BUILD}" = 1 -a "${SHLIB_SUFFIX}" != ""], [
-         LIB_SUFFIX=${SHARED_LIB_SUFFIX}
--        MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${TCL_SHLIB_LD_EXTRAS} ${SHLIB_LD_LIBS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
-+        MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
-         AS_IF([test "${SHLIB_SUFFIX}" = ".dll"], [
-             INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)"'
-             DLL_INSTALL_DIR="\$(BIN_INSTALL_DIR)"
+Index: unix/Makefile.in
+===================================================================
+--- unix.orig/Makefile.in       2013-09-19 13:17:13.000000000 -0700
++++ unix/Makefile.in    2013-11-11 00:20:32.423489861 -0800
+@@ -796,7 +796,10 @@
+            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)/"