From 926092bf39740c26c204ca521ab16b03a0ee7097 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Fri, 17 Aug 2012 16:24:52 -0500 Subject: 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. (From OE-Core rev: 30ae7320265efe039730cd2faf7bd86a264412ed) Signed-off-by: Mark Hatle Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-devtools/pseudo/pseudo.inc | 6 ++++++ 1 file changed, 6 insertions(+) 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 -- cgit v1.2.3-54-g00ecf