summaryrefslogtreecommitdiff
path: root/meta/recipes-multimedia/musicbrainz/files
diff options
context:
space:
mode:
authorConstantin Musca <constantinx.musca@intel.com>2012-12-21 15:26:27 +0200
committerSaul Wold <sgw@linux.intel.com>2012-12-25 14:00:21 -0800
commita9d25a8e6720ceff5cfefa3191026357dd6e0f49 (patch)
tree7bb986992da567c214be1854607d7b34174a624f /meta/recipes-multimedia/musicbrainz/files
parent88869fc442c9387f70a408b64f874a947909f0d5 (diff)
downloadopenembedded-core-a9d25a8e6720ceff5cfefa3191026357dd6e0f49.tar.gz
openembedded-core-a9d25a8e6720ceff5cfefa3191026357dd6e0f49.tar.bz2
openembedded-core-a9d25a8e6720ceff5cfefa3191026357dd6e0f49.zip
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 <constantinx.musca@intel.com> Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-multimedia/musicbrainz/files')
-rw-r--r--meta/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch b/meta/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch
new file mode 100644
index 0000000000..d59d12e69b
--- /dev/null
+++ b/meta/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 <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)