[PATCH 0/1] Fix pseudo-native build when NO32LIBS = 0 is set

[PATCH 0/1] Fix pseudo-native build when NO32LIBS = 0 is set

[Mark Hatle]

The following changes since commit bb74035190c7794fcebaa7f6ba247672a4c34cde:

  libsamplerate: depends on libsdnfile (2012-08-17 18:04:12 +0100)

are available in the git repository at:
  git://git.yoctoproject.org/poky-contrib mhatle/pseudo
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=mhatle/pseudo

Mark Hatle (1):
  pseudo: Fix pseudo-native rebuild when triggered by dep change

 meta/recipes-devtools/pseudo/pseudo.inc |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

-- 
1.7.3.4

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

[Mark Hatle]

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(-)

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
-- 
1.7.3.4

Re: [PATCH 0/1] Fix pseudo-native build when NO32LIBS = 0 is set

[Saul Wold]

On 08/17/2012 02:24 PM, Mark Hatle wrote:
> The following changes since commit bb74035190c7794fcebaa7f6ba247672a4c34cde:
>
>    libsamplerate: depends on libsdnfile (2012-08-17 18:04:12 +0100)
>
> are available in the git repository at:
>    git://git.yoctoproject.org/poky-contrib mhatle/pseudo
>    http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=mhatle/pseudo
>
> Mark Hatle (1):
>    pseudo: Fix pseudo-native rebuild when triggered by dep change
>
>   meta/recipes-devtools/pseudo/pseudo.inc |    6 ++++++
>   1 files changed, 6 insertions(+), 0 deletions(-)
>

Merged into OE-Core

Thanks
	Sau!