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_8.6.0.bb | |
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_8.6.0.bb')
-rw-r--r-- | meta-oe/recipes-devtools/tcltk/tk_8.6.0.bb | 79 |
1 files changed, 0 insertions, 79 deletions
diff --git a/meta-oe/recipes-devtools/tcltk/tk_8.6.0.bb b/meta-oe/recipes-devtools/tcltk/tk_8.6.0.bb deleted file mode 100644 index 14c6ce54c..000000000 --- a/meta-oe/recipes-devtools/tcltk/tk_8.6.0.bb +++ /dev/null | |||
@@ -1,79 +0,0 @@ | |||
1 | SUMMARY = "Tool Command Language ToolKit Extension" | ||
2 | HOMEPAGE = "http://tcl.sourceforge.net" | ||
3 | SECTION = "devel/tcltk" | ||
4 | |||
5 | # http://www.tcl.tk/software/tcltk/license.html | ||
6 | LICENSE = "tcl" | ||
7 | LIC_FILES_CHKSUM = "file://../license.terms;md5=c88f99decec11afa967ad33d314f87fe \ | ||
8 | file://../compat/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ | ||
9 | file://../doc/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ | ||
10 | file://../library/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ | ||
11 | file://../macosx/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ | ||
12 | file://../tests/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ | ||
13 | file://../unix/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ | ||
14 | file://../win/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ | ||
15 | file://../xlib/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ | ||
16 | " | ||
17 | |||
18 | DEPENDS = "tcl virtual/libx11 libxt" | ||
19 | |||
20 | SRC_URI = "\ | ||
21 | ${SOURCEFORGE_MIRROR}/tcl/${BPN}${PV}-src.tar.gz \ | ||
22 | file://confsearch.diff;striplevel=2 \ | ||
23 | file://non-linux.diff;striplevel=2 \ | ||
24 | file://tklibrary.diff;striplevel=2 \ | ||
25 | file://tkprivate.diff;striplevel=2 \ | ||
26 | file://fix-xft.diff \ | ||
27 | file://configure.use.fontconfig.with.xft.patch \ | ||
28 | " | ||
29 | SRC_URI[md5sum] = "b883a1a3c489c17413fb602a94bf54e8" | ||
30 | SRC_URI[sha256sum] = "5c708b2b6f658916df59190b27750fa1ea2bc10992108e10f961c0700f058de6" | ||
31 | |||
32 | S = "${WORKDIR}/${BPN}${PV}/unix" | ||
33 | |||
34 | # Short version format: "8.6" | ||
35 | VER = "${@os.path.splitext(d.getVar('PV', True))[0]}" | ||
36 | |||
37 | LDFLAGS += "-Wl,-rpath,${libdir}/tcltk/${PV}/lib" | ||
38 | inherit autotools distro_features_check | ||
39 | # depends on virtual/libx11 | ||
40 | REQUIRED_DISTRO_FEATURES = "x11" | ||
41 | |||
42 | EXTRA_OECONF = "\ | ||
43 | --enable-threads \ | ||
44 | --with-x \ | ||
45 | --with-tcl=${STAGING_BINDIR_CROSS} \ | ||
46 | --libdir=${libdir} \ | ||
47 | " | ||
48 | |||
49 | do_install_append() { | ||
50 | ln -sf libtk${VER}.so ${D}${libdir}/libtk${VER}.so.0 | ||
51 | oe_libinstall -so libtk${VER} ${D}${libdir} | ||
52 | ln -sf wish${VER} ${D}${bindir}/wish | ||
53 | |||
54 | # Even after passing libdir=${libdir} at config, some incorrect dirs are still generated for the multilib build | ||
55 | if [ "$libdir" != "/usr/lib" ]; then | ||
56 | # Move files to correct library directory | ||
57 | mv ${D}/usr/lib/tk${VER}/* ${D}/${libdir}/tk${VER}/ | ||
58 | # Remove unneeded/incorrect dir ('usr/lib/') | ||
59 | rm -rf ${D}/usr/lib | ||
60 | fi | ||
61 | } | ||
62 | |||
63 | PACKAGECONFIG ??= "xft" | ||
64 | PACKAGECONFIG[xft] = "--enable-xft,--disable-xft,xft" | ||
65 | PACKAGECONFIG[xss] = "--enable-xss,--disable-xss,libxscrnsaver libxext" | ||
66 | |||
67 | PACKAGES =+ "${PN}-lib" | ||
68 | |||
69 | FILES_${PN}-lib = "${libdir}/libtk${VER}.so*" | ||
70 | FILES_${PN} += "${libdir}/tk*" | ||
71 | |||
72 | # isn't getting picked up by shlibs code | ||
73 | RDEPENDS_${PN} += "tk-lib" | ||
74 | RDEPENDS_${PN}_class-native = "" | ||
75 | |||
76 | BBCLASSEXTEND = "native" | ||
77 | |||
78 | # Fix the path in sstate | ||
79 | SSTATE_SCAN_FILES += "*Config.sh" | ||