summaryrefslogtreecommitdiffstats
path: root/meta/packages/tcltk/tcl/tcl-add-soname.patch
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2010-06-22 03:06:55 -0700
committerSaul Wold <Saul.Wold@intel.com>2010-06-30 23:30:27 -0700
commitea7fbed6430bca27953a0ac4f1820d75e09f8d46 (patch)
treeb9b13248719393dd9d9dd92fea3fe1fe78ce1def /meta/packages/tcltk/tcl/tcl-add-soname.patch
parent31c0e3df13151307c34d40c5c746f55c5e068127 (diff)
downloadpoky-ea7fbed6430bca27953a0ac4f1820d75e09f8d46.tar.gz
tcl: upgraded from 8.4.19 to 8.5.8
patche changes: tcl-add-soname.patch: rebased to the newer release code Also added metadata variables, LIC_FILES_CHKSUM Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Diffstat (limited to 'meta/packages/tcltk/tcl/tcl-add-soname.patch')
-rw-r--r--meta/packages/tcltk/tcl/tcl-add-soname.patch82
1 files changed, 30 insertions, 52 deletions
diff --git a/meta/packages/tcltk/tcl/tcl-add-soname.patch b/meta/packages/tcltk/tcl/tcl-add-soname.patch
index 38762644cd..9cb816da51 100644
--- a/meta/packages/tcltk/tcl/tcl-add-soname.patch
+++ b/meta/packages/tcltk/tcl/tcl-add-soname.patch
@@ -1,72 +1,50 @@
1--- clean/tcl8.4.19/unix/configure 2008-04-17 21:29:49.000000000 +0100 1Index: unix/configure
2+++ tcl8.4.19/unix/configure 2009-11-13 11:46:36.000000000 +0000 2===================================================================
3@@ -3065,6 +3065,7 @@ 3--- unix.orig/configure
4 SHLIB_CFLAGS="-fPIC" 4+++ unix/configure
5@@ -6726,6 +6726,7 @@ fi
6 # symbols when dynamically loaded into tclsh.
5 SHLIB_LD_LIBS='${LIBS}' 7 SHLIB_LD_LIBS='${LIBS}'
6 SHLIB_SUFFIX=".so" 8 SHLIB_SUFFIX=".so"
7+ SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.so.0' 9+ SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.so.0'
8 10
9 CFLAGS_OPTIMIZE=-O2 11 DL_OBJS="tclLoadDl.o"
10 # egcs-2.91.66 on Redhat Linux 6.0 generates lots of warnings 12 LD_LIBRARY_PATH_VAR="LIBPATH"
11@@ -3072,12 +3073,15 @@ 13Index: unix/tcl.m4
12 # get rid of the warnings. 14===================================================================
13 #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" 15--- unix.orig/tcl.m4
14 16+++ unix/tcl.m4
15+ # following line added by CW for Debian GNU/Linux 17@@ -1424,6 +1424,7 @@ dnl AC_CHECK_TOOL(AR, ar)
16+ TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\${TCL_LIB_FILE}"
17+
18 if test "$have_dl" = yes; then
19 SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
20 DL_OBJS="tclLoadDl.o"
21 DL_LIBS="-ldl"
22 LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
23- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
24+ CC_SEARCH_FLAGS=""
25 LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
26 else
27 ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'`
28@@ -4299,7 +4303,7 @@
29
30 if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then
31 LIB_SUFFIX=${SHARED_LIB_SUFFIX}
32- MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
33+ MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS} ; ln -s $(LIB_FILE) `basename $(LIB_FILE) .so.0`\${SHLIB_SUFFIX}'
34 INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)'
35 else
36 LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
37--- clean/tcl8.4.19/unix/tcl.m4 2008-04-17 21:29:49.000000000 +0100
38+++ tcl8.4.19/unix/tcl.m4 2009-11-13 11:53:57.000000000 +0000
39@@ -1337,6 +1337,7 @@
40 SHLIB_CFLAGS="-fPIC" 18 SHLIB_CFLAGS="-fPIC"
41 SHLIB_LD_LIBS='${LIBS}' 19 SHLIB_LD_LIBS='${LIBS}'
42 SHLIB_SUFFIX=".so" 20 SHLIB_SUFFIX=".so"
43+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.0' 21+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.0'
44 22
45 CFLAGS_OPTIMIZE=-O2 23 CFLAGS_OPTIMIZE="-O2"
46 # egcs-2.91.66 on Redhat Linux 6.0 generates lots of warnings 24 # egcs-2.91.66 on Redhat Linux 6.0 generates lots of warnings
47@@ -1344,12 +1345,15 @@ 25@@ -1431,12 +1432,15 @@ dnl AC_CHECK_TOOL(AR, ar)
48 # get rid of the warnings. 26 # get rid of the warnings.
49 #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" 27 #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
50 28
51+ # following line added by CW for Debian GNU/Linux 29+ # following line added by CW for Debian GNU/Linux
52+ TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\${TCL_LIB_FILE}.0" 30+ TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\${TCL_LIB_FILE}.0"
53+ 31+
54 if test "$have_dl" = yes; then 32 SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
55 SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}' 33 DL_OBJS="tclLoadDl.o"
56 DL_OBJS="tclLoadDl.o" 34 DL_LIBS="-ldl"
57 DL_LIBS="-ldl" 35 LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
58 LDFLAGS="$LDFLAGS -Wl,--export-dynamic" 36 AS_IF([test $doRpath = yes], [
59- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' 37- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
60+ CC_SEARCH_FLAGS="" 38+ CC_SEARCH_FLAGS=''])
61 LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} 39 LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
62 else 40 AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"])
63 AC_CHECK_HEADER(dld.h, [ 41 AS_IF([test $do64bit = yes], [
64@@ -2117,7 +2121,7 @@ 42@@ -2079,7 +2083,7 @@ dnl # preprocessing tests use only CPPFL
65 43
66 if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then 44 AS_IF([test "${SHARED_BUILD}" = 1 -a "${SHLIB_SUFFIX}" != ""], [
67 LIB_SUFFIX=${SHARED_LIB_SUFFIX} 45 LIB_SUFFIX=${SHARED_LIB_SUFFIX}
68- MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}' 46- MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
69+ MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS} ; ln -s $(LIB_FILE) `basename $(LIB_FILE) .so.0`\${SHLIB_SUFFIX}' 47+ MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
70 INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)' 48 INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)"/$(LIB_FILE)'
71 else 49 ], [
72 LIB_SUFFIX=${UNSHARED_LIB_SUFFIX} 50 LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}