summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBogdan Marinescu <bogdan.a.marinescu@intel.com>2013-05-09 15:36:40 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-12 09:37:30 +0100
commitcac01c037d159ae1221ad8fb7bbd04545871674c (patch)
tree030753bae26570d9d47e5852c67dc14888998315
parent02b07632032bc8c8bc7f8484c932ff478f641068 (diff)
downloadpoky-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>
-rw-r--r--meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch96
-rw-r--r--meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch91
-rw-r--r--meta/recipes-devtools/tcltk/tcl/no_packages.patch53
-rw-r--r--meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch14
-rw-r--r--meta/recipes-devtools/tcltk/tcl_8.6.0.bb (renamed from meta/recipes-devtools/tcltk/tcl_8.5.13.bb)31
5 files changed, 145 insertions, 140 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>
162012/04/26 162012/04/26
17 17
18diff --git unix.orig/Makefile.in unix/Makefile.in 18diff --git unix.orig/Makefile.in unix/Makefile.in
19index c8ce872..06a6406 100644 19index 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)
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 @@
1Upstream-Status: Pending 1Upstream-Status: Pending
2 2
3diff --git unix.orig/Makefile.in unix/Makefile.in 3diff --git unix.orig/Makefile.in unix/Makefile.in
4index 87deb20..c8ce872 100644 4index 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 #
diff --git a/meta/recipes-devtools/tcltk/tcl/no_packages.patch b/meta/recipes-devtools/tcltk/tcl/no_packages.patch
new file mode 100644
index 0000000000..b045814589
--- /dev/null
+++ b/meta/recipes-devtools/tcltk/tcl/no_packages.patch
@@ -0,0 +1,53 @@
1tcl 8.6.0 builds by default a number of packages that are not needed in Yocto.
2This patch changes the makefile so that these packages are not built by default.
3
4Upstream-Status:Inappropriate [embedded specific]
5
6Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
7
8diff --git unix.orig/Makefile.in unix/Makefile.in
9index 16351f6..76ccadb 100644
10--- unix.orig/Makefile.in
11+++ unix/Makefile.in
12@@ -601,7 +601,7 @@ SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $(UNIX_SRCS) $(NOTIFY_SRCS) \
13 # Start of rules
14 #--------------------------------------------------------------------------
15
16-all: binaries libraries doc packages
17+all: binaries libraries doc
18
19 binaries: ${LIB_FILE} $(STUB_LIB_FILE) ${TCL_EXE}
20
21@@ -646,12 +646,12 @@ Makefile: $(UNIX_DIR)/Makefile.in $(DLTEST_DIR)/Makefile.in
22 #tclConfig.h: $(UNIX_DIR)/tclConfig.h.in
23 # $(SHELL) config.status
24
25-clean: clean-packages
26+clean:
27 rm -f *.a *.o libtcl* core errs *~ \#* TAGS *.E a.out \
28 errors ${TCL_EXE} ${TCLTEST_EXE} lib.exp Tcl @DTRACE_HDR@
29 cd dltest ; $(MAKE) clean
30
31-distclean: distclean-packages clean
32+distclean: clean
33 rm -rf Makefile config.status config.cache config.log tclConfig.sh \
34 tclConfig.h *.plist Tcl.framework tcl.pc
35 cd dltest ; $(MAKE) distclean
36@@ -699,7 +699,7 @@ tcltest-real:
37 # tcltest, ie:
38 # % make test TESTFLAGS="-verbose bps -file fileName.test"
39
40-test: test-tcl test-packages
41+test: test-tcl
42
43 test-tcl: ${TCLTEST_EXE}
44 $(SHELL_ENV) ${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl $(TESTFLAGS)
45@@ -764,7 +764,7 @@ INSTALL_PACKAGE_TARGETS = install-packages
46 INSTALL_DEV_TARGETS = install-headers
47 INSTALL_EXTRA_TARGETS = @EXTRA_INSTALL@
48 INSTALL_TARGETS = $(INSTALL_BASE_TARGETS) $(INSTALL_DOC_TARGETS) $(INSTALL_DEV_TARGETS) \
49- $(INSTALL_PACKAGE_TARGETS) $(INSTALL_EXTRA_TARGETS)
50+ $(INSTALL_EXTRA_TARGETS)
51
52 install: $(INSTALL_TARGETS)
53
diff --git a/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch b/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch
index 9947954dbe..eca0a18ec1 100644
--- a/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch
+++ b/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch
@@ -1,10 +1,10 @@
1Upstream-Status: Pending 1Upstream-Status: Pending
2 2
3diff --git unix.orig/configure unix/configure 3diff --git unix.orig/configure unix/configure
4index 163b210..e531122 100755 4index f778a7b..25083c2 100755
5--- unix.orig/configure 5--- unix.orig/configure
6+++ unix/configure 6+++ unix/configure
7@@ -6757,6 +6757,7 @@ fi 7@@ -6889,6 +6889,7 @@ fi
8 LIBS="$LIBS -lc" 8 LIBS="$LIBS -lc"
9 SHLIB_CFLAGS="" 9 SHLIB_CFLAGS=""
10 SHLIB_SUFFIX=".so" 10 SHLIB_SUFFIX=".so"
@@ -13,10 +13,10 @@ index 163b210..e531122 100755
13 DL_OBJS="tclLoadDl.o" 13 DL_OBJS="tclLoadDl.o"
14 LD_LIBRARY_PATH_VAR="LIBPATH" 14 LD_LIBRARY_PATH_VAR="LIBPATH"
15diff --git unix.orig/tcl.m4 unix/tcl.m4 15diff --git unix.orig/tcl.m4 unix/tcl.m4
16index 3974753..46870fa 100644 16index b13fddd..7254f66 100644
17--- unix.orig/tcl.m4 17--- unix.orig/tcl.m4
18+++ unix/tcl.m4 18+++ unix/tcl.m4
19@@ -1420,12 +1420,15 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ 19@@ -1408,12 +1408,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 3974753..46870fa 100644
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@@ -1451,6 +1454,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ 36@@ -1439,6 +1442,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,11 +41,11 @@ index 3974753..46870fa 100644
41 41
42 SHLIB_LD='${CC} -shared' 42 SHLIB_LD='${CC} -shared'
43 DL_OBJS="" 43 DL_OBJS=""
44@@ -2103,7 +2107,7 @@ dnl # preprocessing tests use only CPPFLAGS. 44@@ -2098,7 +2102,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} ${TCL_SHLIB_LD_EXTRAS} ${SHLIB_LD_LIBS} ${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 AS_IF([test "${SHLIB_SUFFIX}" = ".dll"], [ 50 AS_IF([test "${SHLIB_SUFFIX}" = ".dll"], [
51 INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)"' 51 INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)"'
diff --git a/meta/recipes-devtools/tcltk/tcl_8.5.13.bb b/meta/recipes-devtools/tcltk/tcl_8.6.0.bb
index be9c61bf34..7648a817e8 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.5.13.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.6.0.bb
@@ -3,25 +3,24 @@ LICENSE = "BSD-3-Clause"
3SECTION = "devel/tcltk" 3SECTION = "devel/tcltk"
4HOMEPAGE = "http://tcl.sourceforge.net" 4HOMEPAGE = "http://tcl.sourceforge.net"
5DEPENDS = "tcl-native" 5DEPENDS = "tcl-native"
6LIC_FILES_CHKSUM = "file://../license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11 \ 6LIC_FILES_CHKSUM = "file://../license.terms;md5=3c6f62c07835353e36f0db550ccfb65a \
7 file://../compat/license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11 \ 7 file://../compat/license.terms;md5=3c6f62c07835353e36f0db550ccfb65a \
8 file://../library/license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11 \ 8 file://../library/license.terms;md5=3c6f62c07835353e36f0db550ccfb65a \
9 file://../macosx/license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11 \ 9 file://../macosx/license.terms;md5=3c6f62c07835353e36f0db550ccfb65a \
10 file://../tests/license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11 \ 10 file://../tests/license.terms;md5=3c6f62c07835353e36f0db550ccfb65a \
11 file://../win/license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11 \ 11 file://../win/license.terms;md5=3c6f62c07835353e36f0db550ccfb65a \
12 " 12 "
13 13
14PR = "r0"
15
16BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \ 14BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \
17 file://tcl-add-soname.patch" 15 file://tcl-add-soname.patch"
18 16
19SRC_URI = "${BASE_SRC_URI} \ 17SRC_URI = "${BASE_SRC_URI} \
20 file://fix_non_native_build_issue.patch \ 18 file://fix_non_native_build_issue.patch \
21 file://fix_issue_with_old_distro_glibc.patch " 19 file://fix_issue_with_old_distro_glibc.patch \
20 file://no_packages.patch"
22 21
23SRC_URI[md5sum] = "fa3a9bf9b2d6ed2431f1baa46f4058b8" 22SRC_URI[md5sum] = "573aa5fe678e9185ef2b3c56b24658d3"
24SRC_URI[sha256sum] = "9b868dd563e65671a26fcf518b6b86c1bb1b6756f48fdc90f04301d4f3a6596a" 23SRC_URI[sha256sum] = "354422b9c4791685499123b2dfe01faa98b555c08906c010cb4449ddc75dcade"
25 24
26SRC_URI_class-native = "${BASE_SRC_URI}" 25SRC_URI_class-native = "${BASE_SRC_URI}"
27 26
@@ -44,8 +43,8 @@ do_compile_prepend() {
44 43
45do_install() { 44do_install() {
46 autotools_do_install 45 autotools_do_install
47 oe_libinstall -so libtcl8.5 ${D}${libdir} 46 oe_libinstall -so libtcl8.6 ${D}${libdir}
48 ln -sf ./tclsh8.5 ${D}${bindir}/tclsh 47 ln -sf ./tclsh8.6 ${D}${bindir}/tclsh
49 sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh 48 sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh
50 sed -i "s,-L${libdir},-L=${libdir},g" tclConfig.sh 49 sed -i "s,-L${libdir},-L=${libdir},g" tclConfig.sh
51 sed -i "s,-I${includedir},-I=${includedir},g" tclConfig.sh 50 sed -i "s,-I${includedir},-I=${includedir},g" tclConfig.sh
@@ -65,9 +64,9 @@ tcl_sysroot_preprocess () {
65} 64}
66 65
67PACKAGES =+ "tcl-lib" 66PACKAGES =+ "tcl-lib"
68FILES_tcl-lib = "${libdir}/libtcl8.5.so*" 67FILES_tcl-lib = "${libdir}/libtcl8.6.so*"
69FILES_${PN} += "${prefix}/lib/tcl8.5 ${prefix}/lib/tcl8" 68FILES_${PN} += "${prefix}/lib/tcl8.6 ${prefix}/lib/tcl8"
70FILES_${PN}-dev += "${libdir}/tclConfig.sh" 69FILES_${PN}-dev += "${libdir}/tclConfig.sh ${libdir}/tclooConfig.sh"
71 70
72# isn't getting picked up by shlibs code 71# isn't getting picked up by shlibs code
73RDEPENDS_${PN} += "tcl-lib" 72RDEPENDS_${PN} += "tcl-lib"