Constantin Musca : libmusicbrainz: upgrade to git SRCREV 0749dd0a35b4a543

Module: openembedded-core.git
Branch: master
Commit: a9d25a8e6720ceff5cfefa3191026357dd6e0f49
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=a9d25a8e6720ceff5cfefa3191026357dd6e0f49

Author: Constantin Musca <[email protected]>
Date:   Fri Dec 21 15:26:27 2012 +0200

libmusicbrainz: upgrade to git SRCREV 0749dd0a35b4a543

include/musicbrainz3/includes.h: removed from LIC_FILES_CHKSUM
- the file is not present in the new version
fix_build_issue_for_gcc_4.5.0.patch: removed
- the patched files are removed

[Other changes]
- moved to git (the last tag version doesn't support cross-compilation)
- we need to build the native make-c-interface executable before configuring cmake for the target

Signed-off-by Constantin Musca <[email protected]>

Signed-off-by Cristian Iorga <[email protected]>

Signed-off-by Saul Wold <[email protected]>

---

 .../allow-libdir-override.patch                    |    0
 .../fix_build_issue_for_gcc_4.5.0.patch            |   39 --------------------
 .../musicbrainz/libmusicbrainz_3.0.3.bb            |   22 -----------
 .../musicbrainz/libmusicbrainz_git.bb              |   36 ++++++++++++++++++
 4 files changed, 36 insertions(+), 61 deletions(-)

meta/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb new file +23 -0

new file mode 100644
index 0000000..7343662
@@ -0,0 +1,36 @@
+SUMMARY = "MusicBrainz Client"
+DESCRIPTION = "The MusicBrainz client is a library which can be built into other programs.  The library allows you to access the data held on the MusicBrainz server."
+HOMEPAGE = "http://musicbrainz.org"
+LICENSE = "LGPLv2.1+"
+LIC_FILES_CHKSUM = "file://COPYING.txt;md5=fbc093901857fcd118f065f900982c24"
+DEPENDS = "expat neon"
+
+PV = "5.0.1+git${SRCPV}"
+PR = "r0"
+
+SRCREV = "0749dd0a35b4a54316da064475863a4ac6e28e7e"
+SRC_URI = "git://github.com/metabrainz/libmusicbrainz.git \
+           file://allow-libdir-override.patch "
+
+S = "${WORKDIR}/git"
+
+LDFLAGS_prepend_libc-uclibc = " -lpthread "
+
+
+inherit cmake pkgconfig
+
+do_configure_prepend() {
+    mkdir build-native

Quoted 4 lines

Commit: a9d25a8e6720ceff5cfefa3191026357dd6e0f49
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=a9d25a8e6720ceff5cfefa3191026357dd6e0f49

...
libmusicbrainz: upgrade to git SRCREV 0749dd0a35b4a543

this fails tests for build-hosts without libcap2 installed:

2012/12/26 <[email protected]>:

Quoted 62 lines

Module: openembedded-core.git
Branch: master
Commit: a9d25a8e6720ceff5cfefa3191026357dd6e0f49
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=a9d25a8e6720ceff5cfefa3191026357dd6e0f49

Author: Constantin Musca <[email protected]>
Date:   Fri Dec 21 15:26:27 2012 +0200

libmusicbrainz: upgrade to git SRCREV 0749dd0a35b4a543

include/musicbrainz3/includes.h: removed from LIC_FILES_CHKSUM
- the file is not present in the new version
fix_build_issue_for_gcc_4.5.0.patch: removed
- the patched files are removed

[Other changes]
- moved to git (the last tag version doesn't support cross-compilation)
- we need to build the native make-c-interface executable before configuring cmake for the target

Signed-off-by Constantin Musca <[email protected]>

Signed-off-by Cristian Iorga <[email protected]>

Signed-off-by Saul Wold <[email protected]>

---

 .../allow-libdir-override.patch                    |    0
 .../fix_build_issue_for_gcc_4.5.0.patch            |   39 --------------------
 .../musicbrainz/libmusicbrainz_3.0.3.bb            |   22 -----------
 .../musicbrainz/libmusicbrainz_git.bb              |   36 ++++++++++++++++++
 4 files changed, 36 insertions(+), 61 deletions(-)

meta/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb new file +23 -0

new file mode 100644
index 0000000..7343662
@@ -0,0 +1,36 @@
+SUMMARY = "MusicBrainz Client"
+DESCRIPTION = "The MusicBrainz client is a library which can be built into other programs.  The library allows you to access the data held on the MusicBrainz server."
+HOMEPAGE = "http://musicbrainz.org"
+LICENSE = "LGPLv2.1+"
+LIC_FILES_CHKSUM = "file://COPYING.txt;md5=fbc093901857fcd118f065f900982c24"
+DEPENDS = "expat neon"
+
+PV = "5.0.1+git${SRCPV}"
+PR = "r0"
+
+SRCREV = "0749dd0a35b4a54316da064475863a4ac6e28e7e"
+SRC_URI = "git://github.com/metabrainz/libmusicbrainz.git \
+           file://allow-libdir-override.patch "
+
+S = "${WORKDIR}/git"
+
+LDFLAGS_prepend_libc-uclibc = " -lpthread "
+
+
+inherit cmake pkgconfig
+
+do_configure_prepend() {
+    mkdir build-native

meta/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb line 33

Quoted 10 lines

meta/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb new file +10 -0

+    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
+    cd ..
+}

Hi,

this fails tests for build-hosts without libcap2 installed:

| Linking CXX shared library libmusicbrainz5.so
| [ 87%] Built target musicbrainz5
| Scanning dependencies of target ctest
| [ 88%] Building C object tests/CMakeFiles/ctest.dir/ctest.c.o
| Linking C executable ctest
| /usr/bin/ld: warning: libcap.so.2, needed by

/home/jenkins/workspace/OpenEmbedded-Nightly/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/libgcrypt.so.11, not found (try using -rpath or -rpath-link)
| /home/jenkins/workspace/OpenEmbedded-Nightly/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/libgcrypt.so.11:
undefined reference to `cap_from_text'
| /home/jenkins/workspace/OpenEmbedded-Nightly/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/libgcrypt.so.11:
undefined reference to `cap_set_proc'

| collect2: ld returned 1 exit status
| make[2]: *** [tests/ctest] Error 1
| make[1]: *** [tests/CMakeFiles/ctest.dir/all] Error 2
| make: *** [all] Error 2
| ERROR: Function failed: do_configure (see

/home/jenkins/workspace/OpenEmbedded-Nightly/build/tmp-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libmusicbrainz/5.0.1+gitAUTOINC+0749dd0a35b4a54316da064475863a4ac6e28e7e-r0/temp/log.do_configure.32319 for further information)
NOTE: recipe libmusicbrainz-5.0.1+gitAUTOINC+0749dd0a35b4a54316da064475863a4ac6e28e7e-r0:
task do_configure: Failed
ERROR: Task 6593
(/home/jenkins/workspace/OpenEmbedded-Nightly/sources/openembedded-core/meta/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb,
do_configure) failed with exit code '1'

Note: libcap-native was built and deployed but not found by the linker..