From 96649fff6de8a44ff3462df14fb8e152b6caf4f1 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 9 Jan 2013 16:26:04 +0000 Subject: 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 Signed-off-by: Saul Wold --- meta/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'meta/recipes-multimedia/musicbrainz') diff --git a/meta/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb b/meta/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb index 7343662d01..21eec6df5a 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 .. } -- cgit v1.2.3