summaryrefslogtreecommitdiff
path: root/meta/recipes-devtools/tcltk/tcl
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2011-10-20 09:00:07 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-24 13:25:52 +0100
commit9b4ba9b9b0260bab94f662da1b76ddc5e45bb7a8 (patch)
tree47f88829e8c15a00207f10655a88b8ee21aa6b44 /meta/recipes-devtools/tcltk/tcl
parent99da9a4e65f9dffb04efc3ad60125194c476d6b3 (diff)
downloadopenembedded-core-9b4ba9b9b0260bab94f662da1b76ddc5e45bb7a8.tar.gz
openembedded-core-9b4ba9b9b0260bab94f662da1b76ddc5e45bb7a8.tar.bz2
openembedded-core-9b4ba9b9b0260bab94f662da1b76ddc5e45bb7a8.tar.xz
openembedded-core-9b4ba9b9b0260bab94f662da1b76ddc5e45bb7a8.zip
tcl: upgrade from 8.5.9 to 8.5.10
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Diffstat (limited to 'meta/recipes-devtools/tcltk/tcl')
-rw-r--r--meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch16
-rw-r--r--meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch26
2 files changed, 17 insertions, 25 deletions
diff --git a/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch b/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch
index e9b679361..9c2d37961 100644
--- a/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch
+++ b/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch
@@ -4,7 +4,7 @@ Index: unix/Makefile.in
===================================================================
--- unix.orig/Makefile.in
+++ unix/Makefile.in
-@@ -619,20 +619,20 @@ ro-test: tcltest@EXEEXT@
+@@ -619,13 +619,13 @@ ro-test: tcltest@EXEEXT@
shell: ${TCL_EXE}
@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \
TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
@@ -19,16 +19,8 @@ Index: unix/Makefile.in
+ $(GDB) ${TCL_EXE} --command=gdb.run
rm gdb.run
- # This target can be used to run tclsh inside ddd
- ddd: ${TCL_EXE}
- @echo "set env @LD_LIBRARY_PATH_VAR@=\"`pwd`:$${@LD_LIBRARY_PATH_VAR@}\"" > gdb.run
- @echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run
-- $(DDD) -command=gdb.run ./${TCL_EXE}
-+ $(DDD) -command=gdb.run ${TCL_EXE}
- rm gdb.run
-
VALGRINDARGS=--tool=memcheck --num-callers=8 --leak-resolution=high --leak-check=yes --show-reachable=yes -v
-@@ -645,7 +645,7 @@ valgrind: ${TCL_EXE} tcltest@EXEEXT@
+@@ -638,7 +638,7 @@ valgrind: ${TCL_EXE} tcltest@EXEEXT@
valgrindshell: ${TCL_EXE}
@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \
TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
@@ -37,7 +29,7 @@ Index: unix/Makefile.in
# The following target outputs the name of the top-level source directory for
# Tcl (it is used by Tk's configure script, for example). The .NO_PARALLEL
-@@ -809,14 +809,14 @@ install-tzdata: ${TCL_EXE}
+@@ -802,14 +802,14 @@ install-tzdata: ${TCL_EXE}
@echo "Installing time zone data"
@@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \
TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
@@ -54,7 +46,7 @@ Index: unix/Makefile.in
$(TOP_DIR)/library/msgs "$(SCRIPT_INSTALL_DIR)"/msgs
install-doc: doc
-@@ -1756,7 +1756,7 @@ html-tk: ${TCL_EXE}
+@@ -1730,7 +1730,7 @@ html-tk: ${TCL_EXE}
BUILD_HTML = \
@@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \
TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
diff --git a/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch b/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch
index 963576da9..93ef1868c 100644
--- a/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch
+++ b/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch
@@ -4,9 +4,9 @@ Index: unix/configure
===================================================================
--- unix.orig/configure
+++ unix/configure
-@@ -6726,6 +6726,7 @@ fi
- # symbols when dynamically loaded into tclsh.
- SHLIB_LD_LIBS='${LIBS}'
+@@ -6757,6 +6757,7 @@ fi
+ LIBS="$LIBS -lc"
+ SHLIB_CFLAGS=""
SHLIB_SUFFIX=".so"
+ SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.so.0'
@@ -16,15 +16,7 @@ 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"
- # egcs-2.91.66 on Redhat Linux 6.0 generates lots of warnings
-@@ -1431,12 +1432,15 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -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"
@@ -41,7 +33,15 @@ Index: unix/tcl.m4
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
+@@ -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}