aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-devtools
diff options
context:
space:
mode:
authorNick D'Ademo <nickdademo@gmail.com>2013-11-27 21:29:42 +1100
committerMartin Jansa <Martin.Jansa@gmail.com>2013-12-05 19:48:07 +0100
commit1ca29d1cda0d007c4e6a28fe1a4037b4029ad7ae (patch)
treeadd1d86544c58c3fba8cf7276948e53335acf2df /meta-oe/recipes-devtools
parentac02c64e312177565a3e7661af2e449e4997be39 (diff)
downloadmeta-openembedded-contrib-1ca29d1cda0d007c4e6a28fe1a4037b4029ad7ae.tar.gz
meta-openembedded-contrib-1ca29d1cda0d007c4e6a28fe1a4037b4029ad7ae.tar.bz2
meta-openembedded-contrib-1ca29d1cda0d007c4e6a28fe1a4037b4029ad7ae.zip
tk: make multilib build compatible and fix library install
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>
Diffstat (limited to 'meta-oe/recipes-devtools')
-rw-r--r--meta-oe/recipes-devtools/tcltk/tk_8.6.0.bb17
1 files changed, 15 insertions, 2 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
index b76f58f9ea..e99952293e 100644
--- a/meta-oe/recipes-devtools/tcltk/tk_8.6.0.bb
+++ b/meta-oe/recipes-devtools/tcltk/tk_8.6.0.bb
@@ -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"