[oe-commits] Ross Burton : musicbrainz: handle rebuilds

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 96649fff6de8a44ff3462df14fb8e152b6caf4f1
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=96649fff6de8a44ff3462df14fb8e152b6caf4f1

Author: Ross Burton <ross.burton at intel.com>
Date:   Wed Jan  9 16:26:04 2013 +0000

musicbrainz: handle rebuilds

When rebuilding build-native already exists.  Sadly handling the directory
existing causes cmake to forkbomb when rebuilding, so delete an existing
build-native.

Also remove a variable that cmake warns isn't being used, and just build the
tool that we need natively, not the entire library.

Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 .../musicbrainz/libmusicbrainz_git.bb              |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb b/meta/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb
index 7343662..21eec6d 100644
--- a/meta/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb
+++ b/meta/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb
@@ -20,15 +20,17 @@ LDFLAGS_prepend_libc-uclibc = " -lpthread "
 inherit cmake pkgconfig
 
 do_configure_prepend() {
+    # The native build really doesn't like being rebuilt, so delete
+    # it if it's already present.
+    rm -rf build-native
     mkdir build-native
     cd build-native
     cmake -DCMAKE_C_FLAGS=${BUILD_CFLAGS} \
             -DCMAKE_C_COMPILER=${BUILD_CC} \
             -DCMAKE_CXX_FLAGS=${BUILD_CXXFLAGS} \
             -DCMAKE_CXX_COMPILER=${BUILD_CXX} \
-            -DCMAKE_LINK_FLAGS=${BUILD_LDFLAGS} \
             ..
-    make
+    make make-c-interface
     cd ..
 }