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 <nickdademo@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Nick D'Ademo
2013-11-27 21:20:01 +11:00
committed by Richard Purdie
parent 2e62e82e18
commit f609852af8

View File

@@ -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