[PATCH 0/1] iproute2: fix the configure process

[PATCH 0/1] iproute2: fix the configure process

[Chen Qi]

The following changes since commit 2ad7308ee7166641eff99f3b9fe6794de143f6bc:

  oeqa/utils/qemurunner.py: Remove duplicate message on LoggingThread start (2015-09-22 18:13:02 +0100)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib ChenQi/iproute2-configure
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/iproute2-configure

Chen Qi (1):
  iproute2: fix the configure process

 meta/recipes-connectivity/iproute2/iproute2.inc | 6 ++++++
 1 file changed, 6 insertions(+)

-- 
1.9.1

[PATCH 1/1] iproute2: fix the configure process

[Chen Qi]

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 <Qi.Chen@windriver.com>
---
 meta/recipes-connectivity/iproute2/iproute2.inc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc b/meta/recipes-connectivity/iproute2/iproute2.inc
index a53a4e6..29f9062 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
-- 
1.9.1