summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2010-12-01 12:42:48 -0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-12-06 22:02:20 +0000
commit4b791501ed1aa506c3109891d21cae170cc38fd9 (patch)
treee76ea6c59b33c2dfcb1550c7a35bdbf489bdac82
parent37b6d8bcc74a5d6c024b9a722e4714b54e62c217 (diff)
downloadpoky-4b791501ed1aa506c3109891d21cae170cc38fd9.tar.gz
tcl: upgrade from 8.5.8 to 8.5.9
Rebased this patch to the newer upstream code. modified: fix_non_native_build_issue.patch Deleted following patch as the newer upstream code includes it already. deleted: tcl/mips-tclstrtod.patch tcl: update checksums Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
-rw-r--r--meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch46
-rw-r--r--meta/recipes-devtools/tcltk/tcl/mips-tclstrtod.patch28
-rw-r--r--meta/recipes-devtools/tcltk/tcl_8.5.9.bb (renamed from meta/recipes-devtools/tcltk/tcl_8.5.8.bb)8
3 files changed, 28 insertions, 54 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 b2d98c131c..0b8b26cae2 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
@@ -2,62 +2,62 @@ Index: unix/Makefile.in
2=================================================================== 2===================================================================
3--- unix.orig/Makefile.in 3--- unix.orig/Makefile.in
4+++ unix/Makefile.in 4+++ unix/Makefile.in
5@@ -622,20 +622,20 @@ ro-test: tcltest 5@@ -619,20 +619,20 @@ ro-test: tcltest@EXEEXT@
6 shell: tclsh 6 shell: ${TCL_EXE}
7 @LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ 7 @LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \
8 TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ 8 TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
9- ./tclsh $(SCRIPT) 9- ./${TCL_EXE} $(SCRIPT)
10+ tclsh $(SCRIPT) 10+ ${TCL_EXE} $(SCRIPT)
11 11
12 # This target can be used to run tclsh inside either gdb or insight 12 # This target can be used to run tclsh inside either gdb or insight
13 gdb: tclsh 13 gdb: ${TCL_EXE}
14 @echo "set env @LD_LIBRARY_PATH_VAR@=\"`pwd`:$${@LD_LIBRARY_PATH_VAR@}\"" > gdb.run 14 @echo "set env @LD_LIBRARY_PATH_VAR@=\"`pwd`:$${@LD_LIBRARY_PATH_VAR@}\"" > gdb.run
15 @echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run 15 @echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run
16- $(GDB) ./tclsh --command=gdb.run 16- $(GDB) ./${TCL_EXE} --command=gdb.run
17+ $(GDB) tclsh --command=gdb.run 17+ $(GDB) ${TCL_EXE} --command=gdb.run
18 rm gdb.run 18 rm gdb.run
19 19
20 # This target can be used to run tclsh inside ddd 20 # This target can be used to run tclsh inside ddd
21 ddd: tclsh 21 ddd: ${TCL_EXE}
22 @echo "set env @LD_LIBRARY_PATH_VAR@=\"`pwd`:$${@LD_LIBRARY_PATH_VAR@}\"" > gdb.run 22 @echo "set env @LD_LIBRARY_PATH_VAR@=\"`pwd`:$${@LD_LIBRARY_PATH_VAR@}\"" > gdb.run
23 @echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run 23 @echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run
24- $(DDD) -command=gdb.run ./tclsh 24- $(DDD) -command=gdb.run ./${TCL_EXE}
25+ $(DDD) -command=gdb.run tclsh 25+ $(DDD) -command=gdb.run ${TCL_EXE}
26 rm gdb.run 26 rm gdb.run
27 27
28 VALGRINDARGS=--tool=memcheck --num-callers=8 --leak-resolution=high --leak-check=yes --show-reachable=yes -v 28 VALGRINDARGS=--tool=memcheck --num-callers=8 --leak-resolution=high --leak-check=yes --show-reachable=yes -v
29@@ -648,7 +648,7 @@ valgrind: tclsh tcltest 29@@ -645,7 +645,7 @@ valgrind: ${TCL_EXE} tcltest@EXEEXT@
30 valgrindshell: tclsh 30 valgrindshell: ${TCL_EXE}
31 @LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ 31 @LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \
32 TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ 32 TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
33- valgrind $(VALGRINDARGS) ./tclsh $(SCRIPT) 33- valgrind $(VALGRINDARGS) ./${TCL_EXE} $(SCRIPT)
34+ valgrind $(VALGRINDARGS) tclsh $(SCRIPT) 34+ valgrind $(VALGRINDARGS) ${TCL_EXE} $(SCRIPT)
35 35
36 # The following target outputs the name of the top-level source directory for 36 # The following target outputs the name of the top-level source directory for
37 # Tcl (it is used by Tk's configure script, for example). The .NO_PARALLEL 37 # Tcl (it is used by Tk's configure script, for example). The .NO_PARALLEL
38@@ -817,14 +817,14 @@ install-tzdata: tclsh 38@@ -809,14 +809,14 @@ install-tzdata: ${TCL_EXE}
39 @echo "Installing time zone data" 39 @echo "Installing time zone data"
40 @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ 40 @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \
41 TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ 41 TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
42- ./tclsh $(TOOL_DIR)/installData.tcl \ 42- ./${TCL_EXE} $(TOOL_DIR)/installData.tcl \
43+ tclsh $(TOOL_DIR)/installData.tcl \ 43+ ${TCL_EXE} $(TOOL_DIR)/installData.tcl \
44 $(TOP_DIR)/library/tzdata "$(SCRIPT_INSTALL_DIR)"/tzdata 44 $(TOP_DIR)/library/tzdata "$(SCRIPT_INSTALL_DIR)"/tzdata
45 45
46 install-msgs: tclsh 46 install-msgs: ${TCL_EXE}
47 @echo "Installing message catalogs" 47 @echo "Installing message catalogs"
48 @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ 48 @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \
49 TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ 49 TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
50- ./tclsh $(TOOL_DIR)/installData.tcl \ 50- ./${TCL_EXE} $(TOOL_DIR)/installData.tcl \
51+ tclsh $(TOOL_DIR)/installData.tcl \ 51+ ${TCL_EXE} $(TOOL_DIR)/installData.tcl \
52 $(TOP_DIR)/library/msgs "$(SCRIPT_INSTALL_DIR)"/msgs 52 $(TOP_DIR)/library/msgs "$(SCRIPT_INSTALL_DIR)"/msgs
53 53
54 install-doc: doc 54 install-doc: doc
55@@ -1764,7 +1764,7 @@ html-tk: tclsh 55@@ -1756,7 +1756,7 @@ html-tk: ${TCL_EXE}
56 BUILD_HTML = \ 56 BUILD_HTML = \
57 @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ 57 @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \
58 TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ 58 TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
59- ./tclsh $(TOOL_DIR)/tcltk-man2html.tcl --htmldir="$(HTML_INSTALL_DIR)" \ 59- ./${TCL_EXE} $(TOOL_DIR)/tcltk-man2html.tcl --htmldir="$(HTML_INSTALL_DIR)" \
60+ tclsh $(TOOL_DIR)/tcltk-man2html.tcl --htmldir="$(HTML_INSTALL_DIR)" \ 60+ ${TCL_EXE} $(TOOL_DIR)/tcltk-man2html.tcl --htmldir="$(HTML_INSTALL_DIR)" \
61 --srcdir=$(TOP_DIR)/.. $(BUILD_HTML_FLAGS) 61 --srcdir=$(TOP_DIR)/.. $(BUILD_HTML_FLAGS)
62 62
63 # 63 #
diff --git a/meta/recipes-devtools/tcltk/tcl/mips-tclstrtod.patch b/meta/recipes-devtools/tcltk/tcl/mips-tclstrtod.patch
deleted file mode 100644
index c1e0d63324..0000000000
--- a/meta/recipes-devtools/tcltk/tcl/mips-tclstrtod.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1http://sourceforge.net/tracker/index.php?func=detail&aid=2902010&group_id=10894&atid=110894
2
3Pulled from OE by: Saul Wold <saul.wold@intel.com>
4
5--- ../generic/tclStrToD.c.orig
6+++ ../generic/tclStrToD.c
7@@ -71,9 +71,10 @@
8
9 /*
10 * MIPS floating-point units need special settings in control registers
11- * to use gradual underflow as we expect.
12+ * to use gradual underflow as we expect. This fix is for the MIPSpro
13+ * compiler.
14 */
15-#if defined(__mips)
16+#if defined(__sgi) && defined(_COMPILER_VERSION)
17 #include <sys/fpu.h>
18 #endif
19 /*
20@@ -2166,7 +2167,7 @@
21 } bitwhack;
22 #endif
23
24-#if defined(__mips)
25+#if defined(__sgi) && defined(_COMPILER_VERSION)
26 union fpc_csr mipsCR;
27
28 mipsCR.fc_word = get_fpc_csr();
diff --git a/meta/recipes-devtools/tcltk/tcl_8.5.8.bb b/meta/recipes-devtools/tcltk/tcl_8.5.9.bb
index 1edb57bf0d..aa1805b861 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.5.8.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.5.9.bb
@@ -11,14 +11,16 @@ LIC_CHKSUM_FILES = "file://../license.terms;md5=7b4d3c71b2d9a8c1b373609867975570
11 file://../win/license.terms;md5=7b4d3c71b2d9a8c1b373609867975570 \ 11 file://../win/license.terms;md5=7b4d3c71b2d9a8c1b373609867975570 \
12 " 12 "
13 13
14PR = "r4" 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"
18 18
19SRC_URI = "${BASE_SRC_URI} \ 19SRC_URI = "${BASE_SRC_URI} \
20 file://fix_non_native_build_issue.patch \ 20 file://fix_non_native_build_issue.patch "
21 file://mips-tclstrtod.patch;striplevel=0" 21
22SRC_URI[md5sum] = "8512d8db3233041dd68a81476906012a"
23SRC_URI[sha256sum] = "3ab671b417e3eeb41b9cef626d742d8f7f57425101e83e5fcad1d552cd99237d"
22 24
23SRC_URI_virtclass-native = "${BASE_SRC_URI}" 25SRC_URI_virtclass-native = "${BASE_SRC_URI}"
24 26