CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

tk: export TK_LIBRARY='${libdir}/tk${VER}'

Browse Source 
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 <Mingli.Yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Mingli Yu 2018-11-14 15:47:47 +08:00 committed by Armin Kuster
parent 10127acafa
commit 02a9767b3e
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb
View File

@ -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"