From f609852af89a8534dbe6be94bec1a121d1a28b14 Mon Sep 17 00:00:00 2001 From: Nick D'Ademo Date: Wed, 27 Nov 2013 21:20:01 +1100 Subject: tcl: fix version string and make recipe multilib build compatible Explicitly set libdir in EXTRA_OECONF so that the correct library folder is generated in a multilib build. The version string (VER) has been changed to 8.6.1 and the library paths have been updated accordingly so that the related tk recipe can correctly detect tcl (this search is done using the tclConfig.sh script which contains the tcl version number). (From OE-Core rev: e840f526e7223c9d393aab818c7a5a446b89c503) Signed-off-by: Nick D'Ademo Signed-off-by: Richard Purdie --- meta/recipes-devtools/tcltk/tcl_8.6.1.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'meta/recipes-devtools/tcltk') diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.1.bb b/meta/recipes-devtools/tcltk/tcl_8.6.1.bb index f40475d2b5..10186c43d6 100644 --- a/meta/recipes-devtools/tcltk/tcl_8.6.1.bb +++ b/meta/recipes-devtools/tcltk/tcl_8.6.1.bb @@ -28,13 +28,13 @@ SRC_URI_class-native = "${BASE_SRC_URI}" S = "${WORKDIR}/tcl${PV}/unix" -VER = "8.6" +VER = "8.6.1" inherit autotools DEPENDS_class-native = "" -EXTRA_OECONF = "--enable-threads --disable-rpath" +EXTRA_OECONF = "--enable-threads --disable-rpath --libdir=${libdir}" do_configure() { ( cd ${S}; gnu-configize ) @@ -67,8 +67,8 @@ tcl_sysroot_preprocess () { } PACKAGES =+ "tcl-lib" -FILES_tcl-lib = "${libdir}/libtcl${VER}.so.*" -FILES_${PN} += "${libdir}/tcl${VER} ${libdir}/tcl8" +FILES_tcl-lib = "${libdir}/libtcl8.6.so.*" +FILES_${PN} += "${libdir}/tcl${VER} ${libdir}/tcl8.6 ${libdir}/tcl8" FILES_${PN}-dev += "${libdir}/tclConfig.sh ${libdir}/tclooConfig.sh" # isn't getting picked up by shlibs code -- cgit v1.2.3-54-g00ecf