From: Ross Burton Date: Tue, 16 Feb 2016 16:27:19 +0000 (+0000) Subject: cmake: don't inherit autotools X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~26951 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cbc0400621c23243d96dedf4a226a732f5c87c9;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git cmake: don't inherit autotools autotools was inherited for some functions some time ago, but now all it's using it for explicitly is autotools_do_install(), which is basically just "make install". Invoke that directly and we can remove the inherit autotools. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass index 70e8677fc1b..22cd61eb060 100644 --- a/meta/classes/cmake.bbclass +++ b/meta/classes/cmake.bbclass @@ -7,9 +7,6 @@ B = "${WORKDIR}/build" # We need to unset CCACHE otherwise cmake gets too confused CCACHE = "" -# We want the staging and installing functions from autotools -inherit autotools - # C/C++ Compiler (without cpu arch/tune arguments) OECMAKE_C_COMPILER ?= "`echo ${CC} | sed 's/^\([^ ]*\).*/\1/'`" OECMAKE_CXX_COMPILER ?= "`echo ${CXX} | sed 's/^\([^ ]*\).*/\1/'`" @@ -132,7 +129,7 @@ cmake_do_compile() { cmake_do_install() { cd ${B} - autotools_do_install + oe_runmake 'DESTDIR=${D}' install } EXPORT_FUNCTIONS do_configure do_compile do_install do_generate_toolchain_file