summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-01-09 16:26:04 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-10 23:43:14 +0000
commitef97708fc264cb78c5da1e19f12ebeadf365385b (patch)
tree249b51f7845a6a570ec6bf4a0d0d29b82112867f /meta
parent6bd2fb8716380c07d9383ff9466b9c95dd8adc0d (diff)
downloadpoky-ef97708fc264cb78c5da1e19f12ebeadf365385b.tar.gz
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. (From OE-Core rev: 96649fff6de8a44ff3462df14fb8e152b6caf4f1) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb6
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 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 "
20inherit cmake pkgconfig 20inherit cmake pkgconfig
21 21
22do_configure_prepend() { 22do_configure_prepend() {
23 # The native build really doesn't like being rebuilt, so delete
24 # it if it's already present.
25 rm -rf build-native
23 mkdir build-native 26 mkdir build-native
24 cd build-native 27 cd build-native
25 cmake -DCMAKE_C_FLAGS=${BUILD_CFLAGS} \ 28 cmake -DCMAKE_C_FLAGS=${BUILD_CFLAGS} \
26 -DCMAKE_C_COMPILER=${BUILD_CC} \ 29 -DCMAKE_C_COMPILER=${BUILD_CC} \
27 -DCMAKE_CXX_FLAGS=${BUILD_CXXFLAGS} \ 30 -DCMAKE_CXX_FLAGS=${BUILD_CXXFLAGS} \
28 -DCMAKE_CXX_COMPILER=${BUILD_CXX} \ 31 -DCMAKE_CXX_COMPILER=${BUILD_CXX} \
29 -DCMAKE_LINK_FLAGS=${BUILD_LDFLAGS} \
30 .. 32 ..
31 make 33 make make-c-interface
32 cd .. 34 cd ..
33} 35}
34 36