aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2014-05-05 23:46:11 +0200
committerAndreas Oberritter <obi@opendreambox.org>2015-04-22 10:07:58 +0200
commitcc4c86733df40504f93eabc46ec66017fbcee8aa (patch)
treec4e7be54e981dbebd79bea2654262eafa09b222f
parent765c71a2b9f869cf536744413371c8577413d1f0 (diff)
downloadmeta-openembedded-contrib-cc4c86733df40504f93eabc46ec66017fbcee8aa.tar.gz
libmusicbrainz: add dependency on neon-native
* we're building separate native binary make-c-interface which is also checking for neon with pkg-config, when it fails it's not fatal and configure continues to configure target version (which finds neon correctly) but failed native make-c-interface build resultsin this error: -- Found PkgConfig: /OE/build/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/pkg-config (found version "0.28") -- checking for module 'neon' -- found neon, version 0.30.0 CMake Error at /OE/build/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/share/cmake-2.8/Modules/FindPackageHandleStandardArgs.cmake:108 (message): Could NOT find Neon (missing: NEON_LIBRARIES) Call Stack (most recent call first): /OE/build/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/share/cmake-2.8/Modules/FindPackageHandleStandardArgs.cmake:315 (_FPHSA_FAILURE_MESSAGE) cmake/modules/FindNeon.cmake:19 (FIND_PACKAGE_HANDLE_STANDARD_ARGS) CMakeLists.txt:22 (FIND_PACKAGE) -- Configuring incomplete, errors occurred! See also "/OE/build/oe-core/tmp-eglibc/work/i586-oe-linux/libmusicbrainz/5.0.1+gitAUTOINC+0749dd0a35-r1/git/build-native/CMakeFiles/CMakeOutput.log". make: *** No rule to make target 'make-c-interface'. Stop. ... -- Found PkgConfig: /OE/build/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/pkg-config (found version "0.28") -- checking for module 'neon' -- found neon, version 0.30.0 -- Found Neon: /OE/build/oe-core/tmp-eglibc/sysroots/qemux86/usr/lib/libneon.so CMake Error at src/CMakeLists.txt:19 (INCLUDE): include could not find load file: /OE/build/oe-core/tmp-eglibc/work/i586-oe-linux/libmusicbrainz/5.0.1+gitAUTOINC+0749dd0a35-r1/git/build-native/ImportExecutables.cmake -- Configuring incomplete, errors occurred! Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> (cherry picked from commit 3182aa9a1eb76af61b52943507a43cef42ce41ee) Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
-rw-r--r--meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb3
1 files changed, 1 insertions, 2 deletions
diff --git a/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb b/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb
index f6a8f53dcd..afadc804da 100644
--- a/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb
+++ b/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "The MusicBrainz client is a library which can be built into other
HOMEPAGE = "http://musicbrainz.org"
LICENSE = "LGPLv2.1+"
LIC_FILES_CHKSUM = "file://COPYING.txt;md5=fbc093901857fcd118f065f900982c24"
-DEPENDS = "expat neon"
+DEPENDS = "expat neon neon-native"
PV = "5.0.1+git${SRCPV}"
PR = "r1"
@@ -16,7 +16,6 @@ S = "${WORKDIR}/git"
LDFLAGS_prepend_libc-uclibc = " -lpthread "
-
inherit cmake pkgconfig
do_configure_prepend() {