diff options
-rw-r--r-- | meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch | 27 | ||||
-rw-r--r-- | meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch | 50 | ||||
-rw-r--r-- | meta/recipes-devtools/tcltk/tcl_8.6.12.bb (renamed from meta/recipes-devtools/tcltk/tcl_8.6.11.bb) | 2 |
3 files changed, 50 insertions, 29 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 5a10c93a31..41aefd1deb 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,10 +1,19 @@ | |||
1 | From 34c3a1adc1bfd13fb877179c37ef74a108f2a749 Mon Sep 17 00:00:00 2001 | ||
2 | From: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
3 | Date: Fri, 13 Aug 2010 12:24:00 -0700 | ||
4 | Subject: [PATCH] tcl: fix a build issue | ||
5 | |||
1 | Upstream-Status: Inappropriate [upstream does not support installed tests] | 6 | Upstream-Status: Inappropriate [upstream does not support installed tests] |
2 | 7 | ||
3 | Index: unix/Makefile.in | 8 | --- |
4 | =================================================================== | 9 | unix/Makefile.in | 20 ++++++++++---------- |
5 | --- a/unix.orig/Makefile.in 2013-11-10 23:37:34.243424934 -0800 | 10 | 1 file changed, 10 insertions(+), 10 deletions(-) |
6 | +++ b/unix/Makefile.in 2013-11-10 23:37:34.243424934 -0800 | 11 | |
7 | @@ -709,23 +709,23 @@ | 12 | diff --git a/unix/Makefile.in b/unix/Makefile.in |
13 | index 804532e..a9cb339 100644 | ||
14 | --- a/unix/Makefile.in | ||
15 | +++ b/unix/Makefile.in | ||
16 | @@ -810,23 +810,23 @@ tcltest-real: | ||
8 | test: test-tcl test-packages | 17 | test: test-tcl test-packages |
9 | 18 | ||
10 | test-tcl: ${TCLTEST_EXE} | 19 | test-tcl: ${TCLTEST_EXE} |
@@ -32,7 +41,7 @@ Index: unix/Makefile.in | |||
32 | 41 | ||
33 | # The following target generates the shared libraries in dltest/ that are used | 42 | # 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 | 43 | # for testing; they are included as part of the "tcltest" target (via the |
35 | @@ -743,23 +743,23 @@ | 44 | @@ -844,25 +844,25 @@ dltest.marker: ${STUB_LIB_FILE} |
36 | # This target can be used to run tclsh from the build directory | 45 | # This target can be used to run tclsh from the build directory |
37 | # via `make shell SCRIPT=/tmp/foo.tcl` | 46 | # via `make shell SCRIPT=/tmp/foo.tcl` |
38 | shell: ${TCL_EXE} | 47 | shell: ${TCL_EXE} |
@@ -45,8 +54,10 @@ Index: unix/Makefile.in | |||
45 | + $(SHELL_ENV) $(GDB) ${TCL_EXE} | 54 | + $(SHELL_ENV) $(GDB) ${TCL_EXE} |
46 | 55 | ||
47 | valgrind: ${TCL_EXE} ${TCLTEST_EXE} | 56 | valgrind: ${TCL_EXE} ${TCLTEST_EXE} |
48 | - $(SHELL_ENV) $(VALGRIND) $(VALGRINDARGS) ./${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl -singleproc 1 -constraints valgrind $(TESTFLAGS) | 57 | - $(SHELL_ENV) $(VALGRIND) $(VALGRINDARGS) ./${TCLTEST_EXE} \ |
49 | + $(SHELL_ENV) $(VALGRIND) $(VALGRINDARGS) ${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl -singleproc 1 -constraints valgrind $(TESTFLAGS) | 58 | + $(SHELL_ENV) $(VALGRIND) $(VALGRINDARGS) ${TCLTEST_EXE} \ |
59 | $(TOP_DIR)/tests/all.tcl -singleproc 1 -constraints valgrind \ | ||
60 | $(TESTFLAGS) | ||
50 | 61 | ||
51 | valgrindshell: ${TCL_EXE} | 62 | valgrindshell: ${TCL_EXE} |
52 | - $(SHELL_ENV) $(VALGRIND) $(VALGRINDARGS) ./${TCL_EXE} $(SCRIPT) | 63 | - $(SHELL_ENV) $(VALGRIND) $(VALGRINDARGS) ./${TCL_EXE} $(SCRIPT) |
diff --git a/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch b/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch index c4283c4f34..3123d289a1 100644 --- a/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch +++ b/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch | |||
@@ -1,25 +1,21 @@ | |||
1 | From d6155ec08b355d64f1a7db407254d159037bb72a Mon Sep 17 00:00:00 2001 | ||
2 | From: Richard Purdie <rpurdie@linux.intel.com> | ||
3 | Date: Wed, 9 Dec 2009 23:59:44 +0000 | ||
4 | Subject: [PATCH] tcl: Add tcltk from OE.dev but with legacy staging function | ||
5 | |||
1 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
2 | 7 | ||
3 | Index: unix/tcl.m4 | 8 | --- |
4 | =================================================================== | 9 | unix/Makefile.in | 5 ++++- |
5 | --- a/unix.orig/tcl.m4 2013-09-19 13:17:13.000000000 -0700 | 10 | unix/tcl.m4 | 3 +++ |
6 | +++ b/unix/tcl.m4 2013-11-11 00:17:24.263485123 -0800 | 11 | 2 files changed, 7 insertions(+), 1 deletion(-) |
7 | @@ -1415,6 +1415,9 @@ | 12 | |
8 | # get rid of the warnings. | 13 | diff --git a/unix/Makefile.in b/unix/Makefile.in |
9 | #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" | 14 | index 398afd0..804532e 100644 |
10 | 15 | --- a/unix/Makefile.in | |
11 | + # following line added by CW for Debian GNU/Linux | 16 | +++ b/unix/Makefile.in |
12 | + TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\${TCL_LIB_FILE}.0" | 17 | @@ -893,7 +893,10 @@ install-binaries: binaries |
13 | + | 18 | done |
14 | SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared' | ||
15 | DL_OBJS="tclLoadDl.o" | ||
16 | DL_LIBS="-ldl" | ||
17 | Index: unix/Makefile.in | ||
18 | =================================================================== | ||
19 | --- a/unix.orig/Makefile.in 2013-09-19 13:17:13.000000000 -0700 | ||
20 | +++ b/unix/Makefile.in 2013-11-11 00:20:32.423489861 -0800 | ||
21 | @@ -796,7 +796,10 @@ | ||
22 | done; | ||
23 | @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" | 19 | @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" |
24 | @@INSTALL_LIB@ | 20 | @@INSTALL_LIB@ |
25 | - @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)" | 21 | - @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)" |
@@ -30,3 +26,17 @@ Index: unix/Makefile.in | |||
30 | @echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}" | 26 | @echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}" |
31 | @$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}" | 27 | @$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}" |
32 | @echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/" | 28 | @echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/" |
29 | diff --git a/unix/tcl.m4 b/unix/tcl.m4 | ||
30 | index f3d08ec..797c93f 100644 | ||
31 | --- a/unix/tcl.m4 | ||
32 | +++ b/unix/tcl.m4 | ||
33 | @@ -1382,6 +1382,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ | ||
34 | # get rid of the warnings. | ||
35 | #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" | ||
36 | |||
37 | + # following line added by CW for Debian GNU/Linux | ||
38 | + TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\${TCL_LIB_FILE}.0" | ||
39 | + | ||
40 | SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared' | ||
41 | DL_OBJS="tclLoadDl.o" | ||
42 | DL_LIBS="-ldl" | ||
diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.11.bb b/meta/recipes-devtools/tcltk/tcl_8.6.12.bb index f8b2a69b9f..824c0286c6 100644 --- a/meta/recipes-devtools/tcltk/tcl_8.6.11.bb +++ b/meta/recipes-devtools/tcltk/tcl_8.6.12.bb | |||
@@ -25,7 +25,7 @@ SRC_URI = "${BASE_SRC_URI} \ | |||
25 | file://interp.patch \ | 25 | file://interp.patch \ |
26 | file://run-ptest \ | 26 | file://run-ptest \ |
27 | " | 27 | " |
28 | SRC_URI[sha256sum] = "cfb49aab82bd179651e23eeeb69606f51b0ddc575ca55c3d35e2457469024cfa" | 28 | SRC_URI[sha256sum] = "186748f1131cef3d637421a18d70892f808e526a29c694bebfeb1c540f98727c" |
29 | 29 | ||
30 | SRC_URI:class-native = "${BASE_SRC_URI}" | 30 | SRC_URI:class-native = "${BASE_SRC_URI}" |
31 | 31 | ||