diff options
author | Ross Burton <ross.burton@intel.com> | 2013-01-09 16:26:04 +0000 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2013-01-09 16:40:38 -0800 |
commit | 96649fff6de8a44ff3462df14fb8e152b6caf4f1 (patch) | |
tree | 9c8b53166d30725ef37497a6a471311cb0001407 | |
parent | 4b0adc3b55fe8541d39e529485a5adce747e77e0 (diff) | |
download | openembedded-core-96649fff6de8a44ff3462df14fb8e152b6caf4f1.tar.gz openembedded-core-96649fff6de8a44ff3462df14fb8e152b6caf4f1.tar.bz2 openembedded-core-96649fff6de8a44ff3462df14fb8e152b6caf4f1.zip |
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@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r-- | meta/recipes-multimedia/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 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 .. } |