53 lines
1.9 KiB
Diff
53 lines
1.9 KiB
Diff
|
Upstream-Status: Pending
|
||
|
|
|
||
|
|
Index: unix/configure
|
||
|
|
===================================================================
|
||
|
|
--- unix.orig/configure
|
||
|
|
+++ unix/configure
|
||
|
|
@@ -6757,6 +6757,7 @@ fi
|
||
|
|
LIBS="$LIBS -lc"
|
||
|
|
SHLIB_CFLAGS=""
|
||
|
|
SHLIB_SUFFIX=".so"
|
||
|
|
+ SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.so.0'
|
||
|
|
|
||
|
|
DL_OBJS="tclLoadDl.o"
|
||
|
|
LD_LIBRARY_PATH_VAR="LIBPATH"
|
||
|
|
Index: unix/tcl.m4
|
||
|
|
===================================================================
|
||
|
|
--- unix.orig/tcl.m4
|
||
|
|
+++ unix/tcl.m4
|
||
|
|
@@ -1399,12 +1399,15 @@ 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} -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], [
|
||
|
|
@@ -1430,6 +1433,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
|
||
|
|
GNU*)
|
||
|
|
SHLIB_CFLAGS="-fPIC"
|
||
|
|
SHLIB_SUFFIX=".so"
|
||
|
|
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.0'
|
||
|
|
|
||
|
|
SHLIB_LD='${CC} -shared'
|
||
|
|
DL_OBJS=""
|
||
|
|
@@ -2081,7 +2085,7 @@ dnl # preprocessing tests use only CPPFL
|
||
|
|
|
||
|
|
AS_IF([test "${SHARED_BUILD}" = 1 -a "${SHLIB_SUFFIX}" != ""], [
|
||
|
|
LIB_SUFFIX=${SHARED_LIB_SUFFIX}
|
||
|
|
- MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${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}'
|
||
|
|
INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)"/$(LIB_FILE)'
|
||
|
|
], [
|
||
|
|
LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
|