[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6554/8267] tcl: cleanups



commit 3ec39b83eaa14ede81458859dcae59bca89cbbec
Author: Ross Burton <ross burton intel com>
Date:   Thu Jun 22 16:33:29 2017 +0100

    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>

 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 40cd18f..5cecf65 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}"
 
 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/


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]