[oe-commits] Tom Rini : autoconf: Really only build in desired SUBDIRS

git version control git at git.openembedded.org
Tue Jan 11 16:57:47 UTC 2011


Module: openembedded.git
Branch: master
Commit: 343b75ebf0e5f325b0d99e86b532bfe04f2141b6
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=343b75ebf0e5f325b0d99e86b532bfe04f2141b6

Author: Tom Rini <tom_rini at mentor.com>
Date:   Tue Jan 11 09:54:01 2011 -0700

autoconf: Really only build in desired SUBDIRS

In certain cases we would re-run configure as part of do_compile
and thus wipe out our changes.  So lets make the change before
we run configure the first time so they are preserved.

Signed-off-by: Tom Rini <tom_rini at mentor.com>

---

 recipes/autoconf/autoconf.inc |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/recipes/autoconf/autoconf.inc b/recipes/autoconf/autoconf.inc
index e0ca21a..1815b5d 100644
--- a/recipes/autoconf/autoconf.inc
+++ b/recipes/autoconf/autoconf.inc
@@ -25,6 +25,8 @@ do_configure_prepend () {
 		export ac_cv_path_M4="${ac_cv_path_M4=${bindir}/m4}"
 		export ac_cv_prog_gnu_m4="${ac_cv_prog_gnu_m4=yes}"
 	fi
+
+	sed -i -e's,^SUBDIRS = .*,SUBDIRS = ${SUBDIRS},' ${S}/Makefile.am
 }
 
 do_configure_append() {
@@ -32,10 +34,5 @@ do_configure_append() {
 	sed -i -e "s:#! @PERL@ -w:#! /usr/bin/env perl:" ${S}/bin/*.in
 }
 
-do_compile () {
-	sed -i -e's,^SUBDIRS = .*,SUBDIRS = ${SUBDIRS},' Makefile
-	oe_runmake
-}
-
 PARALLEL_MAKE = ""
 BBCLASSEXTEND = "native"





More information about the Openembedded-commits mailing list