Patchwork tcl: fix version string and make recipe multilib build compatible

login
register
mail settings
Submitter Nick D'Ademo
Date Nov. 27, 2013, 10:20 a.m.
Message ID <1385547601-6240-1-git-send-email-nickdademo@gmail.com>
Download mbox | patch
Permalink /patch/62469/
State New
Headers show

Comments

Nick D'Ademo - Nov. 27, 2013, 10:20 a.m.
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).

Signed-off-by: Nick D'Ademo <nickdademo@gmail.com>
---
 meta/recipes-devtools/tcltk/tcl_8.6.1.bb |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Patch

diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.1.bb b/meta/recipes-devtools/tcltk/tcl_8.6.1.bb
index f40475d..10186c4 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