summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBogdan Marinescu <bogdan.a.marinescu@intel.com>2013-01-07 16:13:14 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-07 14:30:50 +0000
commit5648fec625d69c4c4a8da12dfd599fb118d15360 (patch)
tree2e83bd438782b01eb83c7003a75d143a9b7bd888
parent9277733327e424a80edcf130d577758af1e08b84 (diff)
downloadpoky-5648fec625d69c4c4a8da12dfd599fb118d15360.tar.gz
tcl: updated to version 8.5.13
(From OE-Core rev: 771a8851966d256b40f49fcd4352ea2c704fd985) Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch24
-rw-r--r--meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch24
-rw-r--r--meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch20
-rw-r--r--meta/recipes-devtools/tcltk/tcl_8.5.13.bb (renamed from meta/recipes-devtools/tcltk/tcl_8.5.11.bb)6
4 files changed, 29 insertions, 45 deletions
diff --git a/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch b/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch
index 9c295a66dd..71956f30b7 100644
--- a/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch
+++ b/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch
@@ -15,11 +15,11 @@ Fixes tcl target recipe build on old distros which have glibc older than 2.14
15Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 15Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
162012/04/26 162012/04/26
17 17
18Index: unix/Makefile.in 18diff --git unix.orig/Makefile.in unix/Makefile.in
19=================================================================== 19index c8ce872..06a6406 100644
20--- unix.orig/Makefile.in 20--- unix.orig/Makefile.in
21+++ unix/Makefile.in 21+++ unix/Makefile.in
22@@ -592,12 +592,12 @@ tcltest-real: 22@@ -594,12 +594,12 @@ tcltest-real:
23 # % make test TESTFLAGS="-verbose bps -file fileName.test" 23 # % make test TESTFLAGS="-verbose bps -file fileName.test"
24 24
25 test: tcltest@EXEEXT@ 25 test: tcltest@EXEEXT@
@@ -34,7 +34,7 @@ Index: unix/Makefile.in
34 @echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run 34 @echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run
35 @echo "set args $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) -singleproc 1" >> gdb.run 35 @echo "set args $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) -singleproc 1" >> gdb.run
36 $(GDB) ./tcltest@EXEEXT@ --command=gdb.run 36 $(GDB) ./tcltest@EXEEXT@ --command=gdb.run
37@@ -605,27 +605,27 @@ gdb-test: tcltest@EXEEXT@ 37@@ -607,27 +607,27 @@ gdb-test: tcltest@EXEEXT@
38 38
39 # Useful target to launch a built tcltest with the proper path,... 39 # Useful target to launch a built tcltest with the proper path,...
40 runtest: tcltest@EXEEXT@ 40 runtest: tcltest@EXEEXT@
@@ -66,7 +66,7 @@ Index: unix/Makefile.in
66 @echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run 66 @echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run
67 $(GDB) ${TCL_EXE} --command=gdb.run 67 $(GDB) ${TCL_EXE} --command=gdb.run
68 rm gdb.run 68 rm gdb.run
69@@ -633,12 +633,12 @@ gdb: ${TCL_EXE} 69@@ -635,12 +635,12 @@ gdb: ${TCL_EXE}
70 VALGRINDARGS=--tool=memcheck --num-callers=8 --leak-resolution=high --leak-check=yes --show-reachable=yes -v 70 VALGRINDARGS=--tool=memcheck --num-callers=8 --leak-resolution=high --leak-check=yes --show-reachable=yes -v
71 71
72 valgrind: ${TCL_EXE} tcltest@EXEEXT@ 72 valgrind: ${TCL_EXE} tcltest@EXEEXT@
@@ -81,24 +81,16 @@ Index: unix/Makefile.in
81 TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ 81 TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
82 valgrind $(VALGRINDARGS) ${TCL_EXE} $(SCRIPT) 82 valgrind $(VALGRINDARGS) ${TCL_EXE} $(SCRIPT)
83 83
84@@ -802,14 +802,14 @@ install-libraries: libraries $(INSTALL_T 84@@ -795,7 +795,7 @@ install-libraries: libraries $(INSTALL_TZDATA) install-msgs
85 85
86 install-tzdata: ${TCL_EXE} 86 install-tzdata: ${TCL_EXE}
87 @echo "Installing time zone data" 87 @echo "Installing time zone files to $(SCRIPT_INSTALL_DIR)/tzdata/"
88- @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ 88- @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \
89+ @@LD_LIBRARY_PATH_VAR@="$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ 89+ @@LD_LIBRARY_PATH_VAR@="$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \
90 TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ 90 TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
91 ${TCL_EXE} $(TOOL_DIR)/installData.tcl \ 91 ${TCL_EXE} $(TOOL_DIR)/installData.tcl \
92 $(TOP_DIR)/library/tzdata "$(SCRIPT_INSTALL_DIR)"/tzdata 92 $(TOP_DIR)/library/tzdata "$(SCRIPT_INSTALL_DIR)"/tzdata
93 93@@ -1729,7 +1729,7 @@ html-tk: ${TCL_EXE}
94 install-msgs: ${TCL_EXE}
95 @echo "Installing message catalogs"
96- @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \
97+ @@LD_LIBRARY_PATH_VAR@="$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \
98 TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
99 ${TCL_EXE} $(TOOL_DIR)/installData.tcl \
100 $(TOP_DIR)/library/msgs "$(SCRIPT_INSTALL_DIR)"/msgs
101@@ -1733,7 +1733,7 @@ html-tk: ${TCL_EXE}
102 @EXTRA_BUILD_HTML@ 94 @EXTRA_BUILD_HTML@
103 95
104 BUILD_HTML = \ 96 BUILD_HTML = \
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 9c2d379611..c5f6d8e70b 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
@@ -1,10 +1,10 @@
1Upstream-Status: Pending 1Upstream-Status: Pending
2 2
3Index: unix/Makefile.in 3diff --git unix.orig/Makefile.in unix/Makefile.in
4=================================================================== 4index 87deb20..c8ce872 100644
5--- unix.orig/Makefile.in 5--- unix.orig/Makefile.in
6+++ unix/Makefile.in 6+++ unix/Makefile.in
7@@ -619,13 +619,13 @@ ro-test: tcltest@EXEEXT@ 7@@ -623,13 +623,13 @@ ro-test: tcltest@EXEEXT@
8 shell: ${TCL_EXE} 8 shell: ${TCL_EXE}
9 @LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ 9 @LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \
10 TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ 10 TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
@@ -20,7 +20,7 @@ Index: unix/Makefile.in
20 rm gdb.run 20 rm gdb.run
21 21
22 VALGRINDARGS=--tool=memcheck --num-callers=8 --leak-resolution=high --leak-check=yes --show-reachable=yes -v 22 VALGRINDARGS=--tool=memcheck --num-callers=8 --leak-resolution=high --leak-check=yes --show-reachable=yes -v
23@@ -638,7 +638,7 @@ valgrind: ${TCL_EXE} tcltest@EXEEXT@ 23@@ -642,7 +642,7 @@ valgrind: ${TCL_EXE} tcltest@EXEEXT@
24 valgrindshell: ${TCL_EXE} 24 valgrindshell: ${TCL_EXE}
25 @LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ 25 @LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \
26 TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ 26 TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
@@ -29,24 +29,16 @@ Index: unix/Makefile.in
29 29
30 # The following target outputs the name of the top-level source directory for 30 # The following target outputs the name of the top-level source directory for
31 # Tcl (it is used by Tk's configure script, for example). The .NO_PARALLEL 31 # Tcl (it is used by Tk's configure script, for example). The .NO_PARALLEL
32@@ -802,14 +802,14 @@ install-tzdata: ${TCL_EXE} 32@@ -797,7 +797,7 @@ install-tzdata: ${TCL_EXE}
33 @echo "Installing time zone data" 33 @echo "Installing time zone files to $(SCRIPT_INSTALL_DIR)/tzdata/"
34 @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ 34 @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \
35 TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ 35 TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
36- ./${TCL_EXE} $(TOOL_DIR)/installData.tcl \ 36- ./${TCL_EXE} $(TOOL_DIR)/installData.tcl \
37+ ${TCL_EXE} $(TOOL_DIR)/installData.tcl \ 37+ ${TCL_EXE} $(TOOL_DIR)/installData.tcl \
38 $(TOP_DIR)/library/tzdata "$(SCRIPT_INSTALL_DIR)"/tzdata 38 $(TOP_DIR)/library/tzdata "$(SCRIPT_INSTALL_DIR)"/tzdata
39 39
40 install-msgs: ${TCL_EXE} 40 install-msgs:
41 @echo "Installing message catalogs" 41@@ -1731,7 +1731,7 @@ html-tk: ${TCL_EXE}
42 @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \
43 TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
44- ./${TCL_EXE} $(TOOL_DIR)/installData.tcl \
45+ ${TCL_EXE} $(TOOL_DIR)/installData.tcl \
46 $(TOP_DIR)/library/msgs "$(SCRIPT_INSTALL_DIR)"/msgs
47
48 install-doc: doc
49@@ -1730,7 +1730,7 @@ html-tk: ${TCL_EXE}
50 BUILD_HTML = \ 42 BUILD_HTML = \
51 @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ 43 @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \
52 TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ 44 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 93ef1868c5..9947954dbe 100644
--- a/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch
+++ b/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch
@@ -1,7 +1,7 @@
1Upstream-Status: Pending 1Upstream-Status: Pending
2 2
3Index: unix/configure 3diff --git unix.orig/configure unix/configure
4=================================================================== 4index 163b210..e531122 100755
5--- unix.orig/configure 5--- unix.orig/configure
6+++ unix/configure 6+++ unix/configure
7@@ -6757,6 +6757,7 @@ fi 7@@ -6757,6 +6757,7 @@ fi
@@ -12,11 +12,11 @@ Index: unix/configure
12 12
13 DL_OBJS="tclLoadDl.o" 13 DL_OBJS="tclLoadDl.o"
14 LD_LIBRARY_PATH_VAR="LIBPATH" 14 LD_LIBRARY_PATH_VAR="LIBPATH"
15Index: unix/tcl.m4 15diff --git unix.orig/tcl.m4 unix/tcl.m4
16=================================================================== 16index 3974753..46870fa 100644
17--- unix.orig/tcl.m4 17--- unix.orig/tcl.m4
18+++ unix/tcl.m4 18+++ unix/tcl.m4
19@@ -1399,12 +1399,15 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ 19@@ -1420,12 +1420,15 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
20 # get rid of the warnings. 20 # get rid of the warnings.
21 #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" 21 #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
22 22
@@ -33,7 +33,7 @@ Index: unix/tcl.m4
33 LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} 33 LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
34 AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"]) 34 AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"])
35 AS_IF([test $do64bit = yes], [ 35 AS_IF([test $do64bit = yes], [
36@@ -1430,6 +1433,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ 36@@ -1451,6 +1454,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
37 GNU*) 37 GNU*)
38 SHLIB_CFLAGS="-fPIC" 38 SHLIB_CFLAGS="-fPIC"
39 SHLIB_SUFFIX=".so" 39 SHLIB_SUFFIX=".so"
@@ -41,12 +41,12 @@ Index: unix/tcl.m4
41 41
42 SHLIB_LD='${CC} -shared' 42 SHLIB_LD='${CC} -shared'
43 DL_OBJS="" 43 DL_OBJS=""
44@@ -2081,7 +2085,7 @@ dnl # preprocessing tests use only CPPFL 44@@ -2103,7 +2107,7 @@ dnl # preprocessing tests use only CPPFLAGS.
45 45
46 AS_IF([test "${SHARED_BUILD}" = 1 -a "${SHLIB_SUFFIX}" != ""], [ 46 AS_IF([test "${SHARED_BUILD}" = 1 -a "${SHLIB_SUFFIX}" != ""], [
47 LIB_SUFFIX=${SHARED_LIB_SUFFIX} 47 LIB_SUFFIX=${SHARED_LIB_SUFFIX}
48- MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}' 48- MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
49+ MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}' 49+ MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
50 INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)"/$(LIB_FILE)' 50 AS_IF([test "${SHLIB_SUFFIX}" = ".dll"], [
51 ], [ 51 INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)"'
52 LIB_SUFFIX=${UNSHARED_LIB_SUFFIX} 52 DLL_INSTALL_DIR="\$(BIN_INSTALL_DIR)"
diff --git a/meta/recipes-devtools/tcltk/tcl_8.5.11.bb b/meta/recipes-devtools/tcltk/tcl_8.5.13.bb
index b8f1e9af65..27a9ef66c1 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.5.13.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://../license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11
11 file://../win/license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11 \ 11 file://../win/license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11 \
12 " 12 "
13 13
14PR = "r6" 14PR = "r0"
15 15
16BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \ 16BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \
17 file://tcl-add-soname.patch" 17 file://tcl-add-soname.patch"
@@ -20,8 +20,8 @@ SRC_URI = "${BASE_SRC_URI} \
20 file://fix_non_native_build_issue.patch \ 20 file://fix_non_native_build_issue.patch \
21 file://fix_issue_with_old_distro_glibc.patch " 21 file://fix_issue_with_old_distro_glibc.patch "
22 22
23SRC_URI[md5sum] = "b01a9691c83990b3db0ce62d1012ca67" 23SRC_URI[md5sum] = "fa3a9bf9b2d6ed2431f1baa46f4058b8"
24SRC_URI[sha256sum] = "8addc385fa6b5be4605e6d68fbdc4c0e674c5af1dc1c95ec5420390c4b08042a" 24SRC_URI[sha256sum] = "9b868dd563e65671a26fcf518b6b86c1bb1b6756f48fdc90f04301d4f3a6596a"
25 25
26SRC_URI_class-native = "${BASE_SRC_URI}" 26SRC_URI_class-native = "${BASE_SRC_URI}"
27 27