summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch16
-rw-r--r--meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch26
-rw-r--r--meta/recipes-devtools/tcltk/tcl_8.5.10.bb (renamed from meta/recipes-devtools/tcltk/tcl_8.5.9.bb)6
3 files changed, 20 insertions, 28 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 e9b679361f..9c2d379611 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
@@ -4,7 +4,7 @@ Index: unix/Makefile.in
4=================================================================== 4===================================================================
5--- unix.orig/Makefile.in 5--- unix.orig/Makefile.in
6+++ unix/Makefile.in 6+++ unix/Makefile.in
7@@ -619,20 +619,20 @@ ro-test: tcltest@EXEEXT@ 7@@ -619,13 +619,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; \
@@ -19,16 +19,8 @@ Index: unix/Makefile.in
19+ $(GDB) ${TCL_EXE} --command=gdb.run 19+ $(GDB) ${TCL_EXE} --command=gdb.run
20 rm gdb.run 20 rm gdb.run
21 21
22 # This target can be used to run tclsh inside ddd
23 ddd: ${TCL_EXE}
24 @echo "set env @LD_LIBRARY_PATH_VAR@=\"`pwd`:$${@LD_LIBRARY_PATH_VAR@}\"" > gdb.run
25 @echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run
26- $(DDD) -command=gdb.run ./${TCL_EXE}
27+ $(DDD) -command=gdb.run ${TCL_EXE}
28 rm gdb.run
29
30 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
31@@ -645,7 +645,7 @@ valgrind: ${TCL_EXE} tcltest@EXEEXT@ 23@@ -638,7 +638,7 @@ valgrind: ${TCL_EXE} tcltest@EXEEXT@
32 valgrindshell: ${TCL_EXE} 24 valgrindshell: ${TCL_EXE}
33 @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@; \
34 TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ 26 TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
@@ -37,7 +29,7 @@ Index: unix/Makefile.in
37 29
38 # 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
39 # 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
40@@ -809,14 +809,14 @@ install-tzdata: ${TCL_EXE} 32@@ -802,14 +802,14 @@ install-tzdata: ${TCL_EXE}
41 @echo "Installing time zone data" 33 @echo "Installing time zone data"
42 @@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@; \
43 TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ 35 TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
@@ -54,7 +46,7 @@ Index: unix/Makefile.in
54 $(TOP_DIR)/library/msgs "$(SCRIPT_INSTALL_DIR)"/msgs 46 $(TOP_DIR)/library/msgs "$(SCRIPT_INSTALL_DIR)"/msgs
55 47
56 install-doc: doc 48 install-doc: doc
57@@ -1756,7 +1756,7 @@ html-tk: ${TCL_EXE} 49@@ -1730,7 +1730,7 @@ html-tk: ${TCL_EXE}
58 BUILD_HTML = \ 50 BUILD_HTML = \
59 @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ 51 @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \
60 TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ 52 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 963576da99..93ef1868c5 100644
--- a/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch
+++ b/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch
@@ -4,9 +4,9 @@ Index: unix/configure
4=================================================================== 4===================================================================
5--- unix.orig/configure 5--- unix.orig/configure
6+++ unix/configure 6+++ unix/configure
7@@ -6726,6 +6726,7 @@ fi 7@@ -6757,6 +6757,7 @@ fi
8 # symbols when dynamically loaded into tclsh. 8 LIBS="$LIBS -lc"
9 SHLIB_LD_LIBS='${LIBS}' 9 SHLIB_CFLAGS=""
10 SHLIB_SUFFIX=".so" 10 SHLIB_SUFFIX=".so"
11+ SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.so.0' 11+ SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.so.0'
12 12
@@ -16,15 +16,7 @@ Index: unix/tcl.m4
16=================================================================== 16===================================================================
17--- unix.orig/tcl.m4 17--- unix.orig/tcl.m4
18+++ unix/tcl.m4 18+++ unix/tcl.m4
19@@ -1424,6 +1424,7 @@ dnl AC_CHECK_TOOL(AR, ar) 19@@ -1399,12 +1399,15 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
20 SHLIB_CFLAGS="-fPIC"
21 SHLIB_LD_LIBS='${LIBS}'
22 SHLIB_SUFFIX=".so"
23+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.0'
24
25 CFLAGS_OPTIMIZE="-O2"
26 # egcs-2.91.66 on Redhat Linux 6.0 generates lots of warnings
27@@ -1431,12 +1432,15 @@ dnl AC_CHECK_TOOL(AR, ar)
28 # get rid of the warnings. 20 # get rid of the warnings.
29 #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"
30 22
@@ -41,7 +33,15 @@ Index: unix/tcl.m4
41 LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} 33 LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
42 AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"]) 34 AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"])
43 AS_IF([test $do64bit = yes], [ 35 AS_IF([test $do64bit = yes], [
44@@ -2079,7 +2083,7 @@ dnl # preprocessing tests use only CPPFL 36@@ -1430,6 +1433,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
37 GNU*)
38 SHLIB_CFLAGS="-fPIC"
39 SHLIB_SUFFIX=".so"
40+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.0'
41
42 SHLIB_LD='${CC} -shared'
43 DL_OBJS=""
44@@ -2081,7 +2085,7 @@ dnl # preprocessing tests use only CPPFL
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}
diff --git a/meta/recipes-devtools/tcltk/tcl_8.5.9.bb b/meta/recipes-devtools/tcltk/tcl_8.5.10.bb
index 2eabb4d8d8..a9d80af9ef 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.5.9.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.5.10.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 = "r1" 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"
@@ -19,8 +19,8 @@ BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \
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 21
22SRC_URI[md5sum] = "8512d8db3233041dd68a81476906012a" 22SRC_URI[md5sum] = "a08eaf8467c0631937067c1948dd326b"
23SRC_URI[sha256sum] = "3ab671b417e3eeb41b9cef626d742d8f7f57425101e83e5fcad1d552cd99237d" 23SRC_URI[sha256sum] = "f582063edd5419a39ee8f7b5c8f95d557b5daad13efb0ed2f0967ca185613bb7"
24 24
25SRC_URI_virtclass-native = "${BASE_SRC_URI}" 25SRC_URI_virtclass-native = "${BASE_SRC_URI}"
26 26