summaryrefslogtreecommitdiffstats
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
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-26 11:34:08 +0000
commit216bceccf7da86c74bd72128f5379580ac062140 (patch)
tree8c8b9d8ac532a40ee048a1839234045cb52c0e42 /meta/recipes-multimedia/musicbrainz/files
parentaa90e6090d482f43ee941dda6c7f0bc22116c89f (diff)
downloadpoky-216bceccf7da86c74bd72128f5379580ac062140.tar.gz
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 (From OE-Core rev: a9d25a8e6720ceff5cfefa3191026357dd6e0f49) 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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 @@
1Allow LIB_INSTALL_DIR to be set by the the cmake configure invocation. We dont
2easily have a way of determining something that patches ${LIB_SUFFIX} so we'll
3set LIB_INSTALL_DIR.
4
5Upstream-Status: Inappropriate [configuration]
6
7Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
8
9Index: libmusicbrainz-3.0.3/CMakeLists.txt
10===================================================================
11--- libmusicbrainz-3.0.3.orig/CMakeLists.txt
12+++ libmusicbrainz-3.0.3/CMakeLists.txt
13@@ -26,7 +26,7 @@ FIND_PACKAGE(DiscId)
14 SET(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)")
15 SET(EXEC_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Installation prefix for executables and object code libraries" FORCE)
16 SET(BIN_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/bin CACHE PATH "Installation prefix for user executables" FORCE)
17-SET(LIB_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH "Installation prefix for object code libraries" FORCE)
18+SET(LIB_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH "Installation prefix for object code libraries")
19 SET(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include CACHE PATH "Installation prefix for C header files" FORCE)
20
21 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libmusicbrainz3.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libmusicbrainz3.pc)