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: make multilib build compatible and fix library install

Browse Source 
Pass libdir to EXTRA_OECONF so that recipe generates the correct library folder in a multilib build.

Install shared library symbolic link to image.

Signed-off-by: Nick D'Ademo <nickdademo@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Nick D'Ademo 2013-11-27 21:29:42 +11:00 committed by Martin Jansa
parent ac02c64e31
commit 1ca29d1cda
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
meta-oe/recipes-devtools/tcltk/tk_8.6.0.bb
View File

@ -24,18 +24,31 @@ EXTRA_OECONF = "\
--enable-threads \
--with-x \
--with-tcl=${STAGING_BINDIR_CROSS} \
--libdir=${libdir} \
"
do_install_append() {
mv libtk8.6.so libtk8.6.so.0
ln -sf libtk8.6.so ${D}${libdir}/libtk8.6.so.0
oe_libinstall -so libtk8.6 ${D}${libdir}
ln -sf wish8.6 ${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/tk8.6/* ${D}/${libdir}/tk8.6/
# Remove unneeded/incorrect dir ('usr/lib/')
rm -rf ${D}/usr/lib
fi
}
PACKAGES =+ "${PN}-lib"
FILES_${PN}-lib = "${libdir}/libtk8.6.so.*"
FILES_${PN}-lib = "${libdir}/libtk8.6.so*"
FILES_${PN} += "${libdir}/tk*"
# isn't getting picked up by shlibs code
RDEPENDS_${PN} += "tk-lib"
RDEPENDS_${PN}_class-native = ""
BINCONFIG_GLOB = "*Config.sh"
BBCLASSEXTEND = "native"