]> code.ossystems Code Review - openembedded-core.git/commitdiff
tcl: cleanups
authorRoss Burton <ross.burton@intel.com>
Thu, 22 Jun 2017 15:33:29 +0000 (16:33 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 28 Jun 2017 19:54:53 +0000 (20:54 +0100)
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.

Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/recipes-devtools/tcltk/tcl_8.6.6.bb

index 40cd18fb09aa410c5d50eb39926c35b82f088dd0..5cecf65fb67d70325fdfee6ff8e872d049e43cbf 100644 (file)
@@ -35,23 +35,15 @@ VER = "${PV}"
 
 inherit autotools ptest binconfig
 
-DEPENDS_class-native = "zlib-native"
-
 EXTRA_OECONF = "--enable-threads --disable-rpath --libdir=${libdir}"
 
-do_configure() {
-       cd ${S}
-       gnu-configize
-       cd ${B}
-       oe_runconf
-}
-
 do_compile_prepend() {
        echo > ${S}/../compat/fixstrtod.c
 }
 
 do_install() {
-       autotools_do_install install-private-headers
+       autotools_do_install
+       oe_runmake 'DESTDIR=${D}' install-private-headers
        ln -sf ./tclsh${VER} ${D}${bindir}/tclsh
        ln -sf tclsh8.6 ${D}${bindir}/tclsh${VER}
        sed -i "s;-L${B};-L${STAGING_LIBDIR};g" tclConfig.sh
@@ -59,7 +51,6 @@ do_install() {
        install -d ${D}${bindir_crossscripts}
        install -m 0755 tclConfig.sh ${D}${bindir_crossscripts}
        install -m 0755 tclConfig.sh ${D}${libdir}
-       cd ..
        for dir in compat generic unix; do
                install -d ${D}${includedir}/${BPN}${VER}/$dir
                install -m 0644 ${S}/../$dir/*.h ${D}${includedir}/${BPN}${VER}/$dir/