diff options
| author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2010-06-22 03:06:55 -0700 |
|---|---|---|
| committer | Saul Wold <Saul.Wold@intel.com> | 2010-06-30 23:30:27 -0700 |
| commit | ea7fbed6430bca27953a0ac4f1820d75e09f8d46 (patch) | |
| tree | b9b13248719393dd9d9dd92fea3fe1fe78ce1def /meta/packages/tcltk/tcl | |
| parent | 31c0e3df13151307c34d40c5c746f55c5e068127 (diff) | |
| download | openembedded-core-ea7fbed6430bca27953a0ac4f1820d75e09f8d46.tar.gz openembedded-core-ea7fbed6430bca27953a0ac4f1820d75e09f8d46.tar.bz2 openembedded-core-ea7fbed6430bca27953a0ac4f1820d75e09f8d46.zip | |
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')
| -rw-r--r-- | meta/packages/tcltk/tcl/tcl-add-soname.patch | 82 |
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 @@ ---- clean/tcl8.4.19/unix/configure 2008-04-17 21:29:49.000000000 +0100 -+++ tcl8.4.19/unix/configure 2009-11-13 11:46:36.000000000 +0000 -@@ -3065,6 +3065,7 @@ - SHLIB_CFLAGS="-fPIC" +Index: unix/configure +=================================================================== +--- unix.orig/configure ++++ unix/configure +@@ -6726,6 +6726,7 @@ fi + # symbols when dynamically loaded into tclsh. SHLIB_LD_LIBS='${LIBS}' SHLIB_SUFFIX=".so" + SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.so.0' - CFLAGS_OPTIMIZE=-O2 - # egcs-2.91.66 on Redhat Linux 6.0 generates lots of warnings -@@ -3072,12 +3073,15 @@ - # 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}" -+ - if test "$have_dl" = yes; then - SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}' - DL_OBJS="tclLoadDl.o" - DL_LIBS="-ldl" - LDFLAGS="$LDFLAGS -Wl,--export-dynamic" -- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' -+ CC_SEARCH_FLAGS="" - LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} - else - ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'` -@@ -4299,7 +4303,7 @@ - - if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then - 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} ; ln -s $(LIB_FILE) `basename $(LIB_FILE) .so.0`\${SHLIB_SUFFIX}' - INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)' - else - LIB_SUFFIX=${UNSHARED_LIB_SUFFIX} ---- clean/tcl8.4.19/unix/tcl.m4 2008-04-17 21:29:49.000000000 +0100 -+++ tcl8.4.19/unix/tcl.m4 2009-11-13 11:53:57.000000000 +0000 -@@ -1337,6 +1337,7 @@ + DL_OBJS="tclLoadDl.o" + LD_LIBRARY_PATH_VAR="LIBPATH" +Index: unix/tcl.m4 +=================================================================== +--- unix.orig/tcl.m4 ++++ unix/tcl.m4 +@@ -1424,6 +1424,7 @@ dnl AC_CHECK_TOOL(AR, ar) SHLIB_CFLAGS="-fPIC" SHLIB_LD_LIBS='${LIBS}' SHLIB_SUFFIX=".so" + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.0' - CFLAGS_OPTIMIZE=-O2 + CFLAGS_OPTIMIZE="-O2" # egcs-2.91.66 on Redhat Linux 6.0 generates lots of warnings -@@ -1344,12 +1345,15 @@ +@@ -1431,12 +1432,15 @@ dnl AC_CHECK_TOOL(AR, ar) # 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" + - if test "$have_dl" = yes; then - SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}' - DL_OBJS="tclLoadDl.o" - DL_LIBS="-ldl" - LDFLAGS="$LDFLAGS -Wl,--export-dynamic" -- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' -+ CC_SEARCH_FLAGS="" - LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} - else - AC_CHECK_HEADER(dld.h, [ -@@ -2117,7 +2121,7 @@ + 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], [ +@@ -2079,7 +2083,7 @@ dnl # preprocessing tests use only CPPFL - if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then + 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} ; ln -s $(LIB_FILE) `basename $(LIB_FILE) .so.0`\${SHLIB_SUFFIX}' - INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)' - else ++ 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} |