diff options
author | Andreas Oberritter <obi@opendreambox.org> | 2013-03-19 12:44:20 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-03-21 22:01:08 +0100 |
commit | ea7e9c2e00ce88573a20fcb04bd3176ca0238885 (patch) | |
tree | 195b441b3fa175e442220673ca9ce09e71c3223d /meta-multimedia/recipes-multimedia | |
parent | 6663d9c05efe9b604bd8596a21cd38344e2fa3a1 (diff) | |
download | meta-openembedded-ea7e9c2e00ce88573a20fcb04bd3176ca0238885.tar.gz |
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 <obi@opendreambox.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-multimedia/recipes-multimedia')
-rw-r--r-- | meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb | 7 |
1 files 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 051db7b07..f6a8f53dc 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" | |||
6 | DEPENDS = "expat neon" | 6 | DEPENDS = "expat neon" |
7 | 7 | ||
8 | PV = "5.0.1+git${SRCPV}" | 8 | PV = "5.0.1+git${SRCPV}" |
9 | PR = "r0" | 9 | PR = "r1" |
10 | 10 | ||
11 | SRCREV = "0749dd0a35b4a54316da064475863a4ac6e28e7e" | 11 | SRCREV = "0749dd0a35b4a54316da064475863a4ac6e28e7e" |
12 | SRC_URI = "git://github.com/metabrainz/libmusicbrainz.git \ | 12 | SRC_URI = "git://github.com/metabrainz/libmusicbrainz.git \ |
@@ -21,8 +21,9 @@ inherit cmake pkgconfig | |||
21 | 21 | ||
22 | do_configure_prepend() { | 22 | do_configure_prepend() { |
23 | # The native build really doesn't like being rebuilt, so delete | 23 | # The native build really doesn't like being rebuilt, so delete |
24 | # it if it's already present. | 24 | # it if it's already present. Also delete all other files not |
25 | rm -rf build-native | 25 | # known to Git to fix subsequent invocations of do_configure. |
26 | git clean -dfx -e /.pc/ -e /patches/ . | ||
26 | mkdir build-native | 27 | mkdir build-native |
27 | cd build-native | 28 | cd build-native |
28 | cmake -DCMAKE_C_FLAGS=${BUILD_CFLAGS} \ | 29 | cmake -DCMAKE_C_FLAGS=${BUILD_CFLAGS} \ |