From 02a9767b3eab37642250aaeee5c17a10b38a759e Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Wed, 14 Nov 2018 15:47:47 +0800 Subject: tk: export TK_LIBRARY='${libdir}/tk${VER}' As there is below logic in configure.in [snip] test -z "$TK_LIBRARY" && TK_LIBRARY='$(prefix)/lib/tk$(VERSION)' [snip] It can make TK_LIBRARY to be $(prefix)/lib/tk$(VERSION) and then result in some files installed to /usr/lib/tk8.6 even when ${libdir} actually extract as /usr/lib64 and there is also a commit as below adding hack to workaround this. 1ca29d1cd tk: make multilib build compatible and fix library install Export TK_LIBRARY='${libdir}/tk${VER}' to guarantee the files installed to the expected places and also remove the workaround in the previous commit 1ca29d1cd. Signed-off-by: Mingli Yu Signed-off-by: Khem Raj Signed-off-by: Armin Kuster --- meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb | 10 +--------- 1 file changed, 1 insertion(+), 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 d0f6fe0649..4e38525cbb 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 = "\ --with-tcl=${STAGING_BINDIR}/crossscripts \ --libdir=${libdir} \ " - +export TK_LIBRARY='${libdir}/tk${VER}' do_install_append() { ln -sf libtk${VER}.so ${D}${libdir}/libtk${VER}.so.0 oe_libinstall -so libtk${VER} ${D}${libdir} ln -sf wish${VER} ${D}${bindir}/wish - - # Even after passing libdir=${libdir} at config, some incorrect dirs are still generated for the multilib build - if [ "$libdir" != "/usr/lib" ]; then - # Move files to correct library directory - mv ${D}/usr/lib/tk${VER}/* ${D}/${libdir}/tk${VER}/ - # Remove unneeded/incorrect dir ('usr/lib/') - rm -rf ${D}/usr/lib - fi } PACKAGECONFIG ??= "xft" -- cgit 1.2.3-korg