summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb')
-rw-r--r--meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb10
1 files changed, 1 insertions, 9 deletions
diff --git a/meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb b/meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb
index d0f6fe064..4e38525cb 100644
--- a/meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb
+++ b/meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb
@@ -45,19 +45,11 @@ EXTRA_OECONF = "\
45 --with-tcl=${STAGING_BINDIR}/crossscripts \ 45 --with-tcl=${STAGING_BINDIR}/crossscripts \
46 --libdir=${libdir} \ 46 --libdir=${libdir} \
47" 47"
48 48export TK_LIBRARY='${libdir}/tk${VER}'
49do_install_append() { 49do_install_append() {
50 ln -sf libtk${VER}.so ${D}${libdir}/libtk${VER}.so.0 50 ln -sf libtk${VER}.so ${D}${libdir}/libtk${VER}.so.0
51 oe_libinstall -so libtk${VER} ${D}${libdir} 51 oe_libinstall -so libtk${VER} ${D}${libdir}
52 ln -sf wish${VER} ${D}${bindir}/wish 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} 53}
62 54
63PACKAGECONFIG ??= "xft" 55PACKAGECONFIG ??= "xft"