Skip to contentSkip to conversation

tcl: fix version string and make recipe multilib build compatible

PATCH New Nick D'Ademo 1 participant 1 message Nov 27, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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).

---
 meta/recipes-devtools/tcltk/tcl_8.6.1.bb |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
meta/recipes-devtools/tcltk/tcl_8.6.1.bb +4 -4
index f40475d..10186c4 100644
@@ -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
Signature · 1 line
1.7.9.5