summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2012-08-17 16:24:52 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-19 10:44:10 +0100
commit30ae7320265efe039730cd2faf7bd86a264412ed (patch)
tree6e6f151e1ce8ac3306d2a5486988b640bdacbc65
parent17d616adffc3514b6778acc6ab5d6da34a7366b5 (diff)
downloadopenembedded-core-30ae7320265efe039730cd2faf7bd86a264412ed.tar.gz
openembedded-core-30ae7320265efe039730cd2faf7bd86a264412ed.tar.bz2
openembedded-core-30ae7320265efe039730cd2faf7bd86a264412ed.zip
pseudo: Fix pseudo-native rebuild when triggered by dep change
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> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta/recipes-devtools/pseudo/pseudo.inc6
1 files changed, 6 insertions, 0 deletions
diff --git a/meta/recipes-devtools/pseudo/pseudo.inc b/meta/recipes-devtools/pseudo/pseudo.inc
index ac898d2dd7..095e6e06d9 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