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_non_native_build_issue.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_non_native_build_issue.patch')
-rw-r--r-- | meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch | 91 |
1 files changed, 53 insertions, 38 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 c5f6d8e70b..80d718caf1 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,49 +1,64 @@ | |||
1 | Upstream-Status: Pending | 1 | Upstream-Status: Pending |
2 | 2 | ||
3 | diff --git unix.orig/Makefile.in unix/Makefile.in | 3 | diff --git unix.orig/Makefile.in unix/Makefile.in |
4 | index 87deb20..c8ce872 100644 | 4 | index df05759..571d53f 100644 |
5 | --- unix.orig/Makefile.in | 5 | --- unix.orig/Makefile.in |
6 | +++ unix/Makefile.in | 6 | +++ unix/Makefile.in |
7 | @@ -623,13 +623,13 @@ ro-test: tcltest@EXEEXT@ | 7 | @@ -702,23 +702,23 @@ tcltest-real: |
8 | test: test-tcl test-packages | ||
9 | |||
10 | test-tcl: ${TCLTEST_EXE} | ||
11 | - $(SHELL_ENV) ./${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) | ||
12 | + $(SHELL_ENV) ${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) | ||
13 | |||
14 | gdb-test: ${TCLTEST_EXE} | ||
15 | @echo "set env @LD_LIBRARY_PATH_VAR@=`pwd`:$${@LD_LIBRARY_PATH_VAR@}" > gdb.run | ||
16 | @echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run | ||
17 | @echo "set args $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) -singleproc 1" >> gdb.run | ||
18 | - $(GDB) ./${TCLTEST_EXE} --command=gdb.run | ||
19 | + $(GDB) ${TCLTEST_EXE} --command=gdb.run | ||
20 | rm gdb.run | ||
21 | |||
22 | # Useful target to launch a built tcltest with the proper path,... | ||
23 | runtest: ${TCLTEST_EXE} | ||
24 | - $(SHELL_ENV) ./${TCLTEST_EXE} | ||
25 | + $(SHELL_ENV) ${TCLTEST_EXE} | ||
26 | |||
27 | # Useful target for running the test suite with an unwritable current | ||
28 | # directory... | ||
29 | ro-test: ${TCLTEST_EXE} | ||
30 | - echo 'exec chmod -w .;package require tcltest;tcltest::temporaryDirectory /tmp;source ../tests/all.tcl;exec chmod +w .' | $(SHELL_ENV) ./${TCLTEST_EXE} | ||
31 | + echo 'exec chmod -w .;package require tcltest;tcltest::temporaryDirectory /tmp;source ../tests/all.tcl;exec chmod +w .' | $(SHELL_ENV) ${TCLTEST_EXE} | ||
32 | |||
33 | # The following target generates the shared libraries in dltest/ that are used | ||
34 | # for testing; they are included as part of the "tcltest" target (via the | ||
35 | @@ -736,23 +736,23 @@ dltest.marker: ${STUB_LIB_FILE} | ||
36 | # This target can be used to run tclsh from the build directory | ||
37 | # via `make shell SCRIPT=/tmp/foo.tcl` | ||
8 | shell: ${TCL_EXE} | 38 | shell: ${TCL_EXE} |
9 | @LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ | 39 | - $(SHELL_ENV) ./${TCL_EXE} $(SCRIPT) |
10 | TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ | 40 | + $(SHELL_ENV) ${TCL_EXE} $(SCRIPT) |
11 | - ./${TCL_EXE} $(SCRIPT) | ||
12 | + ${TCL_EXE} $(SCRIPT) | ||
13 | 41 | ||
14 | # This target can be used to run tclsh inside either gdb or insight | 42 | # This target can be used to run tclsh inside either gdb or insight |
15 | gdb: ${TCL_EXE} | 43 | gdb: ${TCL_EXE} |
16 | @echo "set env @LD_LIBRARY_PATH_VAR@=\"`pwd`:$${@LD_LIBRARY_PATH_VAR@}\"" > gdb.run | 44 | - $(SHELL_ENV) $(GDB) ./${TCL_EXE} |
17 | @echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run | 45 | + $(SHELL_ENV) $(GDB) ${TCL_EXE} |
18 | - $(GDB) ./${TCL_EXE} --command=gdb.run | 46 | |
19 | + $(GDB) ${TCL_EXE} --command=gdb.run | 47 | valgrind: ${TCL_EXE} ${TCLTEST_EXE} |
20 | rm gdb.run | 48 | - $(SHELL_ENV) $(VALGRIND) $(VALGRINDARGS) ./${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl -singleproc 1 -constraints valgrind $(TESTFLAGS) |
49 | + $(SHELL_ENV) $(VALGRIND) $(VALGRINDARGS) ${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl -singleproc 1 -constraints valgrind $(TESTFLAGS) | ||
21 | 50 | ||
22 | VALGRINDARGS=--tool=memcheck --num-callers=8 --leak-resolution=high --leak-check=yes --show-reachable=yes -v | ||
23 | @@ -642,7 +642,7 @@ valgrind: ${TCL_EXE} tcltest@EXEEXT@ | ||
24 | valgrindshell: ${TCL_EXE} | 51 | valgrindshell: ${TCL_EXE} |
25 | @LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ | 52 | - $(SHELL_ENV) $(VALGRIND) $(VALGRINDARGS) ./${TCL_EXE} $(SCRIPT) |
26 | TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ | 53 | + $(SHELL_ENV) $(VALGRIND) $(VALGRINDARGS) ${TCL_EXE} $(SCRIPT) |
27 | - valgrind $(VALGRINDARGS) ./${TCL_EXE} $(SCRIPT) | 54 | |
28 | + valgrind $(VALGRINDARGS) ${TCL_EXE} $(SCRIPT) | 55 | trace-shell: ${TCL_EXE} |
29 | 56 | - $(SHELL_ENV) ${TRACE} $(TRACE_OPTS) ./${TCL_EXE} $(SCRIPT) | |
30 | # The following target outputs the name of the top-level source directory for | 57 | + $(SHELL_ENV) ${TRACE} $(TRACE_OPTS) ${TCL_EXE} $(SCRIPT) |
31 | # Tcl (it is used by Tk's configure script, for example). The .NO_PARALLEL | 58 | |
32 | @@ -797,7 +797,7 @@ install-tzdata: ${TCL_EXE} | 59 | trace-test: ${TCLTEST_EXE} |
33 | @echo "Installing time zone files to $(SCRIPT_INSTALL_DIR)/tzdata/" | 60 | - $(SHELL_ENV) ${TRACE} $(TRACE_OPTS) ./${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl -singleproc 1 $(TESTFLAGS) |
34 | @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ | 61 | + $(SHELL_ENV) ${TRACE} $(TRACE_OPTS) ${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl -singleproc 1 $(TESTFLAGS) |
35 | TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ | 62 | |
36 | - ./${TCL_EXE} $(TOOL_DIR)/installData.tcl \ | 63 | #-------------------------------------------------------------------------- |
37 | + ${TCL_EXE} $(TOOL_DIR)/installData.tcl \ | 64 | # Installation rules |
38 | $(TOP_DIR)/library/tzdata "$(SCRIPT_INSTALL_DIR)"/tzdata | ||
39 | |||
40 | install-msgs: | ||
41 | @@ -1731,7 +1731,7 @@ html-tk: ${TCL_EXE} | ||
42 | BUILD_HTML = \ | ||
43 | @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ | ||
44 | TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ | ||
45 | - ./${TCL_EXE} $(TOOL_DIR)/tcltk-man2html.tcl --htmldir="$(HTML_INSTALL_DIR)" \ | ||
46 | + ${TCL_EXE} $(TOOL_DIR)/tcltk-man2html.tcl --htmldir="$(HTML_INSTALL_DIR)" \ | ||
47 | --srcdir=$(TOP_DIR)/.. $(BUILD_HTML_FLAGS) | ||
48 | |||
49 | # | ||