diff options
author | Ross Burton <ross.burton@intel.com> | 2017-06-22 16:33:29 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-28 20:55:08 +0100 |
commit | 3ec39b83eaa14ede81458859dcae59bca89cbbec (patch) | |
tree | 1f3d43e5141957414f5cc5c4aff55d49586a0e8e /meta | |
parent | b090ff6a277aa6e242020d7d6ffb1d351e3ee4e0 (diff) | |
download | poky-3ec39b83eaa14ede81458859dcae59bca89cbbec.tar.gz |
tcl: cleanups
No need to set DEPENDS_class-native explicitly as self-dependencies are ignored
now.
Don't rewrite do_configure, autotools_do_configure works.
Actually invoke the install-private-headers target (autotools_do_install doesn't
take arguments).
Remove redundant cd.
(From OE-Core rev: e41c0827f54ea81274df98473e27263ef7e02c8d)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/tcltk/tcl_8.6.6.bb | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.6.bb b/meta/recipes-devtools/tcltk/tcl_8.6.6.bb index 40cd18fb09..5cecf65fb6 100644 --- a/meta/recipes-devtools/tcltk/tcl_8.6.6.bb +++ b/meta/recipes-devtools/tcltk/tcl_8.6.6.bb | |||
@@ -35,23 +35,15 @@ VER = "${PV}" | |||
35 | 35 | ||
36 | inherit autotools ptest binconfig | 36 | inherit autotools ptest binconfig |
37 | 37 | ||
38 | DEPENDS_class-native = "zlib-native" | ||
39 | |||
40 | EXTRA_OECONF = "--enable-threads --disable-rpath --libdir=${libdir}" | 38 | EXTRA_OECONF = "--enable-threads --disable-rpath --libdir=${libdir}" |
41 | 39 | ||
42 | do_configure() { | ||
43 | cd ${S} | ||
44 | gnu-configize | ||
45 | cd ${B} | ||
46 | oe_runconf | ||
47 | } | ||
48 | |||
49 | do_compile_prepend() { | 40 | do_compile_prepend() { |
50 | echo > ${S}/../compat/fixstrtod.c | 41 | echo > ${S}/../compat/fixstrtod.c |
51 | } | 42 | } |
52 | 43 | ||
53 | do_install() { | 44 | do_install() { |
54 | autotools_do_install install-private-headers | 45 | autotools_do_install |
46 | oe_runmake 'DESTDIR=${D}' install-private-headers | ||
55 | ln -sf ./tclsh${VER} ${D}${bindir}/tclsh | 47 | ln -sf ./tclsh${VER} ${D}${bindir}/tclsh |
56 | ln -sf tclsh8.6 ${D}${bindir}/tclsh${VER} | 48 | ln -sf tclsh8.6 ${D}${bindir}/tclsh${VER} |
57 | sed -i "s;-L${B};-L${STAGING_LIBDIR};g" tclConfig.sh | 49 | sed -i "s;-L${B};-L${STAGING_LIBDIR};g" tclConfig.sh |
@@ -59,7 +51,6 @@ do_install() { | |||
59 | install -d ${D}${bindir_crossscripts} | 51 | install -d ${D}${bindir_crossscripts} |
60 | install -m 0755 tclConfig.sh ${D}${bindir_crossscripts} | 52 | install -m 0755 tclConfig.sh ${D}${bindir_crossscripts} |
61 | install -m 0755 tclConfig.sh ${D}${libdir} | 53 | install -m 0755 tclConfig.sh ${D}${libdir} |
62 | cd .. | ||
63 | for dir in compat generic unix; do | 54 | for dir in compat generic unix; do |
64 | install -d ${D}${includedir}/${BPN}${VER}/$dir | 55 | install -d ${D}${includedir}/${BPN}${VER}/$dir |
65 | install -m 0644 ${S}/../$dir/*.h ${D}${includedir}/${BPN}${VER}/$dir/ | 56 | install -m 0644 ${S}/../$dir/*.h ${D}${includedir}/${BPN}${VER}/$dir/ |