From eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 Mon Sep 17 00:00:00 2001 From: Dave Cobbley Date: Tue, 14 Aug 2018 10:05:37 -0700 Subject: [Subtree] Removing import-layers directory As part of the move to subtrees, need to bring all the import layers content to the top level. Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f Signed-off-by: Dave Cobbley Signed-off-by: Brad Bishop --- .../musicbrainz/files/allow-libdir-override.patch | 21 ++++++++++++ .../musicbrainz/libmusicbrainz_git.bb | 38 ++++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb (limited to 'meta-openembedded/meta-multimedia/recipes-multimedia/musicbrainz') diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch new file mode 100644 index 0000000000..db4d6e8c99 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch @@ -0,0 +1,21 @@ +Allow LIB_INSTALL_DIR to be set by the the cmake configure invocation. We dont +easily have a way of determining something that patches ${LIB_SUFFIX} so we'll +set LIB_INSTALL_DIR. + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Kumar Gala + +Index: git/CMakeLists.txt +=================================================================== +--- git.orig/CMakeLists.txt ++++ git/CMakeLists.txt +@@ -36,7 +36,7 @@ FIND_PACKAGE(LibXml2 REQUIRED) + SET(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)") + SET(EXEC_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Installation prefix for executables and object code libraries" FORCE) + SET(BIN_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/bin CACHE PATH "Installation prefix for user executables" FORCE) +-SET(LIB_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH "Installation prefix for object code libraries" FORCE) ++SET(LIB_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH "Installation prefix for object code libraries") + SET(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include CACHE PATH "Installation prefix for C header files" FORCE) + + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libmusicbrainz5.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libmusicbrainz5.pc) diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb new file mode 100644 index 0000000000..16e52134bd --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb @@ -0,0 +1,38 @@ +SUMMARY = "MusicBrainz client library" +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 libxml2 libxml2-native neon neon-native" + +PV = "5.1.0+git${SRCPV}" + +SRCREV = "44c05779dd996035758f5ec426766aeedce29cc3" +SRC_URI = "git://github.com/metabrainz/libmusicbrainz.git \ + file://allow-libdir-override.patch " + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig + +do_configure_prepend() { + # The native build really doesn't like being rebuilt, so delete + # 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} \ + -DCMAKE_C_COMPILER=${BUILD_CC} \ + -DCMAKE_CXX_FLAGS=${BUILD_CXXFLAGS} \ + -DCMAKE_CXX_COMPILER=${BUILD_CXX} \ + .. + make make-c-interface + cd .. +} + +EXTRA_OECMAKE = "-DLIB_INSTALL_DIR:PATH=${libdir} \ + -DIMPORT_EXECUTABLES=build-native/ImportExecutables.cmake" + +# out-of-tree building doesn't appear to work for this package. +B = "${S}" -- cgit v1.2.3