diff options
author | Li xin <lixin.fnst@cn.fujitsu.com> | 2015-08-03 12:14:33 +0800 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-08-18 11:38:45 +0200 |
commit | bb0bb692d320866980fd0f22147655b1d3d52451 (patch) | |
tree | aedd211c72f0b17b4cc20186840e54fde00c045d /meta-oe/recipes-devtools/tcltk/tk/tkprivate.diff | |
parent | eaf6a6bc51bdc1d5c6f0c8c4fa22f943533be78c (diff) | |
download | meta-openembedded-bb0bb692d320866980fd0f22147655b1d3d52451.tar.gz |
tk: upgrade 8.6.0 -> 8.6.4
update content of non-linux.diff
Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/tcltk/tk/tkprivate.diff')
-rw-r--r-- | meta-oe/recipes-devtools/tcltk/tk/tkprivate.diff | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/meta-oe/recipes-devtools/tcltk/tk/tkprivate.diff b/meta-oe/recipes-devtools/tcltk/tk/tkprivate.diff new file mode 100644 index 000000000..4e1546973 --- /dev/null +++ b/meta-oe/recipes-devtools/tcltk/tk/tkprivate.diff | |||
@@ -0,0 +1,41 @@ | |||
1 | Patch by Chris Waters sets path which are normally point to a directory | ||
2 | with Tk sources to a subdirectory of /usr/include/tcl8.4 (debian/rules | ||
3 | puts private Tk headers there). | ||
4 | |||
5 | --- tk8.5-8.5.8.orig/unix/tkConfig.sh.in | ||
6 | +++ tk8.5-8.5.8/unix/tkConfig.sh.in | ||
7 | @@ -55,7 +55,7 @@ | ||
8 | |||
9 | # String to pass to linker to pick up the Tk library from its | ||
10 | # build directory. | ||
11 | -TK_BUILD_LIB_SPEC='@TK_BUILD_LIB_SPEC@' | ||
12 | +TK_BUILD_LIB_SPEC='@TK_LIB_SPEC@' | ||
13 | |||
14 | # String to pass to linker to pick up the Tk library from its | ||
15 | # installed directory. | ||
16 | @@ -71,7 +71,7 @@ | ||
17 | # different place than the directory containing the source files, this | ||
18 | # points to the location of the sources, not the location where Tk was | ||
19 | # compiled. | ||
20 | -TK_SRC_DIR='@TK_SRC_DIR@' | ||
21 | +TK_SRC_DIR='@includedir@/tk-private' | ||
22 | |||
23 | # Needed if you want to make a 'fat' shared library library | ||
24 | # containing tk objects or link a different wish. | ||
25 | @@ -86,14 +86,14 @@ | ||
26 | |||
27 | # String to pass to linker to pick up the Tk stub library from its | ||
28 | # build directory. | ||
29 | -TK_BUILD_STUB_LIB_SPEC='@TK_BUILD_STUB_LIB_SPEC@' | ||
30 | +TK_BUILD_STUB_LIB_SPEC='@TK_STUB_LIB_SPEC@' | ||
31 | |||
32 | # String to pass to linker to pick up the Tk stub library from its | ||
33 | # installed directory. | ||
34 | TK_STUB_LIB_SPEC='@TK_STUB_LIB_SPEC@' | ||
35 | |||
36 | # Path to the Tk stub library in the build directory. | ||
37 | -TK_BUILD_STUB_LIB_PATH='@TK_BUILD_STUB_LIB_PATH@' | ||
38 | +TK_BUILD_STUB_LIB_PATH='@TK_STUB_LIB_PATH@' | ||
39 | |||
40 | # Path to the Tk stub library in the install directory. | ||
41 | TK_STUB_LIB_PATH='@TK_STUB_LIB_PATH@' | ||