diff options
Diffstat (limited to 'meta/packages')
-rw-r--r-- | meta/packages/tcltk/tcl/fix_non_native_build_issue.patch | 63 | ||||
-rw-r--r-- | meta/packages/tcltk/tcl_8.5.8.bb | 11 |
2 files changed, 70 insertions, 4 deletions
diff --git a/meta/packages/tcltk/tcl/fix_non_native_build_issue.patch b/meta/packages/tcltk/tcl/fix_non_native_build_issue.patch new file mode 100644 index 0000000000..b2d98c131c --- /dev/null +++ b/meta/packages/tcltk/tcl/fix_non_native_build_issue.patch | |||
@@ -0,0 +1,63 @@ | |||
1 | Index: unix/Makefile.in | ||
2 | =================================================================== | ||
3 | --- unix.orig/Makefile.in | ||
4 | +++ unix/Makefile.in | ||
5 | @@ -622,20 +622,20 @@ ro-test: tcltest | ||
6 | shell: tclsh | ||
7 | @LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ | ||
8 | TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ | ||
9 | - ./tclsh $(SCRIPT) | ||
10 | + tclsh $(SCRIPT) | ||
11 | |||
12 | # This target can be used to run tclsh inside either gdb or insight | ||
13 | gdb: tclsh | ||
14 | @echo "set env @LD_LIBRARY_PATH_VAR@=\"`pwd`:$${@LD_LIBRARY_PATH_VAR@}\"" > gdb.run | ||
15 | @echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run | ||
16 | - $(GDB) ./tclsh --command=gdb.run | ||
17 | + $(GDB) tclsh --command=gdb.run | ||
18 | rm gdb.run | ||
19 | |||
20 | # This target can be used to run tclsh inside ddd | ||
21 | ddd: tclsh | ||
22 | @echo "set env @LD_LIBRARY_PATH_VAR@=\"`pwd`:$${@LD_LIBRARY_PATH_VAR@}\"" > gdb.run | ||
23 | @echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run | ||
24 | - $(DDD) -command=gdb.run ./tclsh | ||
25 | + $(DDD) -command=gdb.run tclsh | ||
26 | rm gdb.run | ||
27 | |||
28 | VALGRINDARGS=--tool=memcheck --num-callers=8 --leak-resolution=high --leak-check=yes --show-reachable=yes -v | ||
29 | @@ -648,7 +648,7 @@ valgrind: tclsh tcltest | ||
30 | valgrindshell: tclsh | ||
31 | @LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ | ||
32 | TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ | ||
33 | - valgrind $(VALGRINDARGS) ./tclsh $(SCRIPT) | ||
34 | + valgrind $(VALGRINDARGS) tclsh $(SCRIPT) | ||
35 | |||
36 | # The following target outputs the name of the top-level source directory for | ||
37 | # Tcl (it is used by Tk's configure script, for example). The .NO_PARALLEL | ||
38 | @@ -817,14 +817,14 @@ install-tzdata: tclsh | ||
39 | @echo "Installing time zone data" | ||
40 | @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ | ||
41 | TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ | ||
42 | - ./tclsh $(TOOL_DIR)/installData.tcl \ | ||
43 | + tclsh $(TOOL_DIR)/installData.tcl \ | ||
44 | $(TOP_DIR)/library/tzdata "$(SCRIPT_INSTALL_DIR)"/tzdata | ||
45 | |||
46 | install-msgs: tclsh | ||
47 | @echo "Installing message catalogs" | ||
48 | @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ | ||
49 | TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ | ||
50 | - ./tclsh $(TOOL_DIR)/installData.tcl \ | ||
51 | + tclsh $(TOOL_DIR)/installData.tcl \ | ||
52 | $(TOP_DIR)/library/msgs "$(SCRIPT_INSTALL_DIR)"/msgs | ||
53 | |||
54 | install-doc: doc | ||
55 | @@ -1764,7 +1764,7 @@ html-tk: tclsh | ||
56 | BUILD_HTML = \ | ||
57 | @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ | ||
58 | TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ | ||
59 | - ./tclsh $(TOOL_DIR)/tcltk-man2html.tcl --htmldir="$(HTML_INSTALL_DIR)" \ | ||
60 | + tclsh $(TOOL_DIR)/tcltk-man2html.tcl --htmldir="$(HTML_INSTALL_DIR)" \ | ||
61 | --srcdir=$(TOP_DIR)/.. $(BUILD_HTML_FLAGS) | ||
62 | |||
63 | # | ||
diff --git a/meta/packages/tcltk/tcl_8.5.8.bb b/meta/packages/tcltk/tcl_8.5.8.bb index 7734c8833e..7a03c13f68 100644 --- a/meta/packages/tcltk/tcl_8.5.8.bb +++ b/meta/packages/tcltk/tcl_8.5.8.bb | |||
@@ -2,6 +2,7 @@ DESCRIPTION = "Tool Command Language" | |||
2 | LICENSE = "tcl" | 2 | LICENSE = "tcl" |
3 | SECTION = "devel/tcltk" | 3 | SECTION = "devel/tcltk" |
4 | HOMEPAGE = "http://tcl.sourceforge.net" | 4 | HOMEPAGE = "http://tcl.sourceforge.net" |
5 | DEPENDS = "tcl-native" | ||
5 | LIC_CHKSUM_FILES = "file://../license.terms;md5=7b4d3c71b2d9a8c1b373609867975570 \ | 6 | LIC_CHKSUM_FILES = "file://../license.terms;md5=7b4d3c71b2d9a8c1b373609867975570 \ |
6 | file://../compat/license.terms;md5=7b4d3c71b2d9a8c1b373609867975570 \ | 7 | file://../compat/license.terms;md5=7b4d3c71b2d9a8c1b373609867975570 \ |
7 | file://../library/license.terms;md5=7b4d3c71b2d9a8c1b373609867975570 \ | 8 | file://../library/license.terms;md5=7b4d3c71b2d9a8c1b373609867975570 \ |
@@ -10,16 +11,18 @@ LIC_CHKSUM_FILES = "file://../license.terms;md5=7b4d3c71b2d9a8c1b373609867975570 | |||
10 | file://../win/license.terms;md5=7b4d3c71b2d9a8c1b373609867975570 \ | 11 | file://../win/license.terms;md5=7b4d3c71b2d9a8c1b373609867975570 \ |
11 | " | 12 | " |
12 | 13 | ||
13 | PR = "r0" | 14 | PR = "r1" |
14 | 15 | ||
15 | SRC_URI = "\ | 16 | SRC_URI = " ${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \ |
16 | ${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \ | 17 | file://tcl-add-soname.patch \ |
17 | file://tcl-add-soname.patch" | 18 | file://fix_non_native_build_issue.patch" |
18 | 19 | ||
19 | S = "${WORKDIR}/tcl${PV}/unix" | 20 | S = "${WORKDIR}/tcl${PV}/unix" |
20 | 21 | ||
21 | inherit autotools | 22 | inherit autotools |
22 | 23 | ||
24 | DEPENDS_virtclass-native = "" | ||
25 | |||
23 | EXTRA_OECONF = "--enable-threads" | 26 | EXTRA_OECONF = "--enable-threads" |
24 | 27 | ||
25 | do_configure() { | 28 | do_configure() { |