From ea7e9c2e00ce88573a20fcb04bd3176ca0238885 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Tue, 19 Mar 2013 12:44:20 +0000 Subject: libmusicbrainz: fix subsequent invocations of do_configure Every second invocation of do_configure failed with this error: | CMake Error at src/CMakeLists.txt:19 (INCLUDE): | include could not find load file: | | [...]/git/build-native/ImportExecutables.cmake Signed-off-by: Andreas Oberritter Signed-off-by: Martin Jansa --- .../recipes-multimedia/musicbrainz/libmusicbrainz_git.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb b/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb index 051db7b07d..f6a8f53dcd 100644 --- a/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb +++ b/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=fbc093901857fcd118f065f900982c24" DEPENDS = "expat neon" PV = "5.0.1+git${SRCPV}" -PR = "r0" +PR = "r1" SRCREV = "0749dd0a35b4a54316da064475863a4ac6e28e7e" SRC_URI = "git://github.com/metabrainz/libmusicbrainz.git \ @@ -21,8 +21,9 @@ 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 + # it if it's already present. Also delete all other files not + # known to Git to fix subsequent invocations of do_configure. + git clean -dfx -e /.pc/ -e /patches/ . mkdir build-native cd build-native cmake -DCMAKE_C_FLAGS=${BUILD_CFLAGS} \ -- cgit v1.2.3-54-g00ecf