summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorMatthieu Crapet <Matthieu.Crapet@ingenico.com>2014-05-06 12:59:54 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-08 13:00:33 +0100
commit5ae4aadcae85c129aef6dd6ce2dcdd55e8ae9053 (patch)
tree1c7ea8d3302a017f908c6c2f2453960b4ddcc6f2 /meta/recipes-devtools
parentcc9d01fe646a099edeba660f8d616bc06f64b285 (diff)
downloadpoky-5ae4aadcae85c129aef6dd6ce2dcdd55e8ae9053.tar.gz
tcl: cleanup
Changes: - add missing licence file: tcl - use binconfig to patch tclConfig.sh paths - avoid subshell in do_configure() - use ${PV} (From OE-Core rev: 6ef8ac2ff97a408d4311ebebbafcfaf0a84be4d9) Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com> Signed-off-by: Saul Wold <sgw@linux.intel.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.bb34
1 files changed, 20 insertions, 14 deletions
diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.1.bb b/meta/recipes-devtools/tcltk/tcl_8.6.1.bb
index 9d35da10a1..27f73f2ce2 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.6.1.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.6.1.bb
@@ -1,19 +1,21 @@
1SUMMARY = "Tool Command Language" 1SUMMARY = "Tool Command Language"
2LICENSE = "BSD-3-Clause"
3SECTION = "devel/tcltk"
4HOMEPAGE = "http://tcl.sourceforge.net" 2HOMEPAGE = "http://tcl.sourceforge.net"
5DEPENDS = "tcl-native zlib" 3SECTION = "devel/tcltk"
4
5# http://www.tcl.tk/software/tcltk/license.html
6LICENSE = "tcl & BSD-3-Clause"
6LIC_FILES_CHKSUM = "file://../license.terms;md5=3c6f62c07835353e36f0db550ccfb65a \ 7LIC_FILES_CHKSUM = "file://../license.terms;md5=3c6f62c07835353e36f0db550ccfb65a \
7 file://../compat/license.terms;md5=3c6f62c07835353e36f0db550ccfb65a \ 8 file://../compat/license.terms;md5=3c6f62c07835353e36f0db550ccfb65a \
8 file://../library/license.terms;md5=3c6f62c07835353e36f0db550ccfb65a \ 9 file://../library/license.terms;md5=3c6f62c07835353e36f0db550ccfb65a \
9 file://../macosx/license.terms;md5=3c6f62c07835353e36f0db550ccfb65a \ 10 file://../macosx/license.terms;md5=3c6f62c07835353e36f0db550ccfb65a \
10 file://../tests/license.terms;md5=3c6f62c07835353e36f0db550ccfb65a \ 11 file://../tests/license.terms;md5=3c6f62c07835353e36f0db550ccfb65a \
11 file://../win/license.terms;md5=3c6f62c07835353e36f0db550ccfb65a \ 12 file://../win/license.terms;md5=3c6f62c07835353e36f0db550ccfb65a \
12 " 13"
13 14
14BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \ 15DEPENDS = "tcl-native zlib"
15 file://tcl-add-soname.patch"
16 16
17BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/${BPN}${PV}-src.tar.gz \
18 file://tcl-add-soname.patch"
17SRC_URI = "${BASE_SRC_URI} \ 19SRC_URI = "${BASE_SRC_URI} \
18 file://fix_non_native_build_issue.patch \ 20 file://fix_non_native_build_issue.patch \
19 file://fix_issue_with_old_distro_glibc.patch \ 21 file://fix_issue_with_old_distro_glibc.patch \
@@ -21,24 +23,26 @@ SRC_URI = "${BASE_SRC_URI} \
21 file://tcl-remove-hardcoded-install-path.patch \ 23 file://tcl-remove-hardcoded-install-path.patch \
22 file://alter-includedir.patch \ 24 file://alter-includedir.patch \
23 file://run-ptest \ 25 file://run-ptest \
24 " 26"
25SRC_URI[md5sum] = "aae4b701ee527c6e4e1a6f9c7399882e" 27SRC_URI[md5sum] = "aae4b701ee527c6e4e1a6f9c7399882e"
26SRC_URI[sha256sum] = "16ee769248e64ba1cae6b4834fcc4e4edd7470d881410e8d58f7dd1434343514" 28SRC_URI[sha256sum] = "16ee769248e64ba1cae6b4834fcc4e4edd7470d881410e8d58f7dd1434343514"
27 29
28SRC_URI_class-native = "${BASE_SRC_URI}" 30SRC_URI_class-native = "${BASE_SRC_URI}"
29 31
30S = "${WORKDIR}/tcl${PV}/unix" 32S = "${WORKDIR}/${BPN}${PV}/unix"
31 33
32VER = "8.6.1" 34VER = "${PV}"
33 35
34inherit autotools ptest 36inherit autotools ptest binconfig
35 37
36DEPENDS_class-native = "zlib-native" 38DEPENDS_class-native = "zlib-native"
37 39
38EXTRA_OECONF = "--enable-threads --disable-rpath --libdir=${libdir}" 40EXTRA_OECONF = "--enable-threads --disable-rpath --libdir=${libdir}"
39 41
40do_configure() { 42do_configure() {
41 ( cd ${S}; gnu-configize ) 43 cd ${S}
44 gnu-configize
45 cd ${B}
42 oe_runconf 46 oe_runconf
43} 47}
44 48
@@ -53,13 +57,12 @@ do_install() {
53 sed -i "s+-L${B}+-L${STAGING_LIBDIR}+g" tclConfig.sh 57 sed -i "s+-L${B}+-L${STAGING_LIBDIR}+g" tclConfig.sh
54 sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh 58 sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh
55 sed -i "s,-L${libdir},-L=${libdir},g" tclConfig.sh 59 sed -i "s,-L${libdir},-L=${libdir},g" tclConfig.sh
56 sed -i "s,-I${includedir},-I=${includedir},g" tclConfig.sh 60 sed -i "s,-I${includedir},-I=${includedir},g" tclConfig.sh
57 install -d ${D}${bindir_crossscripts} 61 install -d ${D}${bindir_crossscripts}
58 install -m 0755 tclConfig.sh ${D}${bindir_crossscripts} 62 install -m 0755 tclConfig.sh ${D}${bindir_crossscripts}
59 install -m 0755 tclConfig.sh ${D}${libdir} 63 install -m 0755 tclConfig.sh ${D}${libdir}
60 cd .. 64 cd ..
61 for dir in compat generic unix 65 for dir in compat generic unix; do
62 do
63 install -d ${D}${includedir}/${BPN}${VER}/$dir 66 install -d ${D}${includedir}/${BPN}${VER}/$dir
64 install -m 0644 ${S}/../$dir/*.h ${D}${includedir}/${BPN}${VER}/$dir/ 67 install -m 0644 ${S}/../$dir/*.h ${D}${includedir}/${BPN}${VER}/$dir/
65 done 68 done
@@ -91,5 +94,8 @@ do_install_ptest() {
91 cp -r ${S}/../tests ${D}${PTEST_PATH} 94 cp -r ${S}/../tests ${D}${PTEST_PATH}
92} 95}
93 96
97# Fix some paths that might be used by Tcl extensions
98BINCONFIG_GLOB = "*Config.sh"
99
94# Fix the path in sstate 100# Fix the path in sstate
95SSTATE_SCAN_FILES += "*Config.sh" 101SSTATE_SCAN_FILES += "*Config.sh"