diff options
| author |   Ross Burton <ross.burton@intel.com> | 2013-03-11 16:46:36 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-12 18:25:28 +0000 |
| commit | 62a2f7e9fad6cd6863670ba2376f73c0e929f075 (patch) | |
| tree | bb90bee6ae87ec0d5968390059e6149b580d20cd | |
| parent | 63c7192119d54b92d908441109ed4e4fff761cba (diff) | |
| download | openembedded-core-62a2f7e9fad6cd6863670ba2376f73c0e929f075.tar.gz | |
musicbrainz: remove
This is in meta-multimedia now, so remove from oe-core.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -rw-r--r-- | meta/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch | 21 | ||||
| -rw-r--r-- | meta/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb | 38 |
2 files changed, 0 insertions, 59 deletions
diff --git a/meta/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch b/meta/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch deleted file mode 100644 index d59d12e69b..0000000000 --- a/meta/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch +++ /dev/null @@ -1,21 +0,0 @@ -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 <galak@kernel.crashing.org> - -Index: libmusicbrainz-3.0.3/CMakeLists.txt -=================================================================== ---- libmusicbrainz-3.0.3.orig/CMakeLists.txt -+++ libmusicbrainz-3.0.3/CMakeLists.txt -@@ -26,7 +26,7 @@ FIND_PACKAGE(DiscId) - 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}/libmusicbrainz3.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libmusicbrainz3.pc) diff --git a/meta/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb b/meta/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb deleted file mode 100644 index 21eec6df5a..0000000000 --- a/meta/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb +++ /dev/null @@ -1,38 +0,0 @@ -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() { - # The native build really doesn't like being rebuilt, so delete - # it if it's already present. - rm -rf build-native - 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" |