From a6967f6e441eca758058ced9982b715984ee9b5b Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Thu, 24 Sep 2015 17:27:31 +0800 Subject: iproute2: fix the configure process Previously, the iproute2's configure script is actually run in the do_compile stage. There's a Makefile rule 'all: Config' which makes the configure process run to generate the Config file. However, this makes it hard to fix the dependency problems. We need to generate the Config file in the do_configure stage. Add do_configure_append to separate the configure process from the compile process. Besides, explicitly disable ATM support for iproute2, otherwise we'll sometimes meet errors like below when building. ld: cannot find -latm collect2: error: ld returned 1 exit status Makefile:154: recipe for target 'q_atm.so' failed make[1]: *** [q_atm.so] Error 1 Signed-off-by: Chen Qi Signed-off-by: Ross Burton --- meta/recipes-connectivity/iproute2/iproute2.inc | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'meta/recipes-connectivity') diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc b/meta/recipes-connectivity/iproute2/iproute2.inc index a53a4e6abc..29f90629a7 100644 --- a/meta/recipes-connectivity/iproute2/iproute2.inc +++ b/meta/recipes-connectivity/iproute2/iproute2.inc @@ -15,6 +15,12 @@ inherit update-alternatives EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'" +do_configure_append () { + sh configure ${STAGING_INCDIR} + # Explicitly disable ATM support + sed -i -e '/TC_CONFIG_ATM/d' Config +} + do_install () { oe_runmake DESTDIR=${D} install mv ${D}${base_sbindir}/ip ${D}${base_sbindir}/ip.iproute2 -- cgit 1.2.3-korg