summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorNick D'Ademo <nickdademo@gmail.com>2013-11-27 21:20:01 +1100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-29 09:52:56 +0000
commitf609852af89a8534dbe6be94bec1a121d1a28b14 (patch)
tree4030da0e7647cc13aecae59e0e31666dc6bae42c /meta/recipes-devtools
parent2e62e82e18e5f96cd9c6b76e453a016149d96ff1 (diff)
downloadpoky-f609852af89a8534dbe6be94bec1a121d1a28b14.tar.gz
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>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/tcltk/tcl_8.6.1.bb8
1 files changed, 4 insertions, 4 deletions
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}"
28 28
29S = "${WORKDIR}/tcl${PV}/unix" 29S = "${WORKDIR}/tcl${PV}/unix"
30 30
31VER = "8.6" 31VER = "8.6.1"
32 32
33inherit autotools 33inherit autotools
34 34
35DEPENDS_class-native = "" 35DEPENDS_class-native = ""
36 36
37EXTRA_OECONF = "--enable-threads --disable-rpath" 37EXTRA_OECONF = "--enable-threads --disable-rpath --libdir=${libdir}"
38 38
39do_configure() { 39do_configure() {
40 ( cd ${S}; gnu-configize ) 40 ( cd ${S}; gnu-configize )
@@ -67,8 +67,8 @@ tcl_sysroot_preprocess () {
67} 67}
68 68
69PACKAGES =+ "tcl-lib" 69PACKAGES =+ "tcl-lib"
70FILES_tcl-lib = "${libdir}/libtcl${VER}.so.*" 70FILES_tcl-lib = "${libdir}/libtcl8.6.so.*"
71FILES_${PN} += "${libdir}/tcl${VER} ${libdir}/tcl8" 71FILES_${PN} += "${libdir}/tcl${VER} ${libdir}/tcl8.6 ${libdir}/tcl8"
72FILES_${PN}-dev += "${libdir}/tclConfig.sh ${libdir}/tclooConfig.sh" 72FILES_${PN}-dev += "${libdir}/tclConfig.sh ${libdir}/tclooConfig.sh"
73 73
74# isn't getting picked up by shlibs code 74# isn't getting picked up by shlibs code