Patchwork [V2] musicbrainz: handle rebuilds

login
register
mail settings
Submitter Ross Burton
Date Jan. 9, 2013, 4:26 p.m.
Message ID <1357748764-5551-1-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/42391/
State Accepted
Commit ef97708fc264cb78c5da1e19f12ebeadf365385b
Headers show

Comments

Ross Burton - Jan. 9, 2013, 4:26 p.m.
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@intel.com>
---
 meta/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Patch

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 ..
 }