Patchwork [1/1] pseudo: Fix pseudo-native rebuild when triggered by dep change

login
register
mail settings
Submitter Mark Hatle
Date Aug. 17, 2012, 9:24 p.m.
Message ID <a36fdb0eda016ee08ac063bf343d6b42259a2378.1345238651.git.mark.hatle@windriver.com>
Download mbox | patch
Permalink /patch/34865/
State Accepted
Commit 30ae7320265efe039730cd2faf7bd86a264412ed
Headers show

Comments

Mark Hatle - Aug. 17, 2012, 9:24 p.m.
When NO32LIBS = 0, building 32-bit version of pseudo-native and
building on a 64-bit host -- if the build was triggered by a
dependency change on something pseudo uses, the build could fail
due to left over files from the previous build.  Fix this by
ensuring we run make distclean (and ignoring any failure codes) to
ensure we start over.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
 meta/recipes-devtools/pseudo/pseudo.inc |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

Patch

diff --git a/meta/recipes-devtools/pseudo/pseudo.inc b/meta/recipes-devtools/pseudo/pseudo.inc
index ac898d2..095e6e0 100644
--- a/meta/recipes-devtools/pseudo/pseudo.inc
+++ b/meta/recipes-devtools/pseudo/pseudo.inc
@@ -45,6 +45,12 @@  do_compile_prepend_virtclass-native () {
 		# We need the 32-bit libpseudo on a 64-bit machine...
                 # ... and we really, really, hope that the native host is
                 # x86, or else --bits may not work.
+
+		# if we're being rebuilt due to a dependency change, we need to make sure
+		# everything is clean before we configure and build -- if we haven't previously
+		# built this will fail and be ignored.
+		make ${MAKEOPTS} distclean || :
+
 		./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 --without-rpath
 		oe_runmake ${MAKEOPTS} libpseudo
 		# prevent it from removing the lib, but remove everything else