diff options
author | Bogdan Marinescu <bogdan.a.marinescu@intel.com> | 2013-05-09 15:36:40 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-12 09:37:30 +0100 |
commit | cac01c037d159ae1221ad8fb7bbd04545871674c (patch) | |
tree | 030753bae26570d9d47e5852c67dc14888998315 /meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch | |
parent | 02b07632032bc8c8bc7f8484c932ff478f641068 (diff) | |
download | poky-cac01c037d159ae1221ad8fb7bbd04545871674c.tar.gz |
tcl: upgraded to 8.6.0
The license checksum changed because of a small correction in the
license text.
(From OE-Core rev: eb2b082146cf3ba229a816faa9c87fd098c0627f)
Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch')
-rw-r--r-- | meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch | 96 |
1 files changed, 17 insertions, 79 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 71956f30b7..ed581755c6 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 | |||
@@ -16,86 +16,24 @@ Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | |||
16 | 2012/04/26 | 16 | 2012/04/26 |
17 | 17 | ||
18 | diff --git unix.orig/Makefile.in unix/Makefile.in | 18 | diff --git unix.orig/Makefile.in unix/Makefile.in |
19 | index c8ce872..06a6406 100644 | 19 | index 571d53f..16351f6 100644 |
20 | --- unix.orig/Makefile.in | 20 | --- unix.orig/Makefile.in |
21 | +++ unix/Makefile.in | 21 | +++ unix/Makefile.in |
22 | @@ -594,12 +594,12 @@ tcltest-real: | 22 | @@ -679,7 +679,7 @@ topDirName: |
23 | # % make test TESTFLAGS="-verbose bps -file fileName.test" | 23 | # tcltest executable gets the build directory burned into its ld search path. |
24 | 24 | # This keeps tcltest from picking up an already installed version of the Tcl | |
25 | test: tcltest@EXEEXT@ | 25 | # library. |
26 | - @LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ | 26 | -SHELL_ENV = @LD_LIBRARY_PATH_VAR@=`pwd`:${@LD_LIBRARY_PATH_VAR@} \ |
27 | + @LD_LIBRARY_PATH_VAR@="$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ | 27 | +SHELL_ENV = @LD_LIBRARY_PATH_VAR@=${@LD_LIBRARY_PATH_VAR@} \ |
28 | TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ | 28 | TCLLIBPATH="@abs_builddir@/pkgs" \ |
29 | ./tcltest@EXEEXT@ $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) | 29 | TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}" |
30 | 30 | ||
31 | gdb-test: tcltest@EXEEXT@ | 31 | @@ -705,7 +705,7 @@ test-tcl: ${TCLTEST_EXE} |
32 | - @echo "set env @LD_LIBRARY_PATH_VAR@=\"`pwd`:$${@LD_LIBRARY_PATH_VAR@}\"" > gdb.run | 32 | $(SHELL_ENV) ${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) |
33 | + @echo "set env @LD_LIBRARY_PATH_VAR@=\"$${@LD_LIBRARY_PATH_VAR@}\"" > gdb.run | 33 | |
34 | gdb-test: ${TCLTEST_EXE} | ||
35 | - @echo "set env @LD_LIBRARY_PATH_VAR@=`pwd`:$${@LD_LIBRARY_PATH_VAR@}" > gdb.run | ||
36 | + @echo "set env @LD_LIBRARY_PATH_VAR@=$${@LD_LIBRARY_PATH_VAR@}" > gdb.run | ||
34 | @echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run | 37 | @echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run |
35 | @echo "set args $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) -singleproc 1" >> gdb.run | 38 | @echo "set args $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) -singleproc 1" >> gdb.run |
36 | $(GDB) ./tcltest@EXEEXT@ --command=gdb.run | 39 | $(GDB) ${TCLTEST_EXE} --command=gdb.run |
37 | @@ -607,27 +607,27 @@ gdb-test: tcltest@EXEEXT@ | ||
38 | |||
39 | # Useful target to launch a built tcltest with the proper path,... | ||
40 | runtest: tcltest@EXEEXT@ | ||
41 | - @LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ | ||
42 | + @LD_LIBRARY_PATH_VAR@="$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ | ||
43 | TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ | ||
44 | ./tcltest@EXEEXT@ | ||
45 | |||
46 | # Useful target for running the test suite with an unwritable current | ||
47 | # directory... | ||
48 | ro-test: tcltest@EXEEXT@ | ||
49 | - @LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ | ||
50 | + @LD_LIBRARY_PATH_VAR@="$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ | ||
51 | TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ | ||
52 | echo 'exec chmod -w .;package require tcltest;tcltest::temporaryDirectory /tmp;source ../tests/all.tcl;exec chmod +w .' | ./tcltest@EXEEXT@ | ||
53 | |||
54 | # This target can be used to run tclsh from the build directory | ||
55 | # via `make shell SCRIPT=/tmp/foo.tcl` | ||
56 | shell: ${TCL_EXE} | ||
57 | - @LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ | ||
58 | + @LD_LIBRARY_PATH_VAR@="$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ | ||
59 | TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ | ||
60 | ${TCL_EXE} $(SCRIPT) | ||
61 | |||
62 | # This target can be used to run tclsh inside either gdb or insight | ||
63 | gdb: ${TCL_EXE} | ||
64 | - @echo "set env @LD_LIBRARY_PATH_VAR@=\"`pwd`:$${@LD_LIBRARY_PATH_VAR@}\"" > gdb.run | ||
65 | + @echo "set env @LD_LIBRARY_PATH_VAR@=\"$${@LD_LIBRARY_PATH_VAR@}\"" > gdb.run | ||
66 | @echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run | ||
67 | $(GDB) ${TCL_EXE} --command=gdb.run | ||
68 | rm gdb.run | ||
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 | ||
71 | |||
72 | valgrind: ${TCL_EXE} tcltest@EXEEXT@ | ||
73 | - @LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ | ||
74 | + @LD_LIBRARY_PATH_VAR@="$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ | ||
75 | TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ | ||
76 | valgrind $(VALGRINDARGS) ./tcltest@EXEEXT@ $(TOP_DIR)/tests/all.tcl -singleproc 1 $(TESTFLAGS) | ||
77 | |||
78 | valgrindshell: ${TCL_EXE} | ||
79 | - @LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ | ||
80 | + @LD_LIBRARY_PATH_VAR@="$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ | ||
81 | TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ | ||
82 | valgrind $(VALGRINDARGS) ${TCL_EXE} $(SCRIPT) | ||
83 | |||
84 | @@ -795,7 +795,7 @@ install-libraries: libraries $(INSTALL_TZDATA) install-msgs | ||
85 | |||
86 | install-tzdata: ${TCL_EXE} | ||
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@; \ | ||
89 | + @@LD_LIBRARY_PATH_VAR@="$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ | ||
90 | TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ | ||
91 | ${TCL_EXE} $(TOOL_DIR)/installData.tcl \ | ||
92 | $(TOP_DIR)/library/tzdata "$(SCRIPT_INSTALL_DIR)"/tzdata | ||
93 | @@ -1729,7 +1729,7 @@ html-tk: ${TCL_EXE} | ||
94 | @EXTRA_BUILD_HTML@ | ||
95 | |||
96 | BUILD_HTML = \ | ||
97 | - @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ | ||
98 | + @@LD_LIBRARY_PATH_VAR@="$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ | ||
99 | TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ | ||
100 | ${TCL_EXE} $(TOOL_DIR)/tcltk-man2html.tcl --htmldir="$(HTML_INSTALL_DIR)" \ | ||
101 | --srcdir=$(TOP_DIR)/.. $(BUILD_HTML_FLAGS) | ||