sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

libmusicbrainz: utilize base_libdir when configured 

Pass $libdir through when we configure to support a location
other than /lib.  We also have to tweak the cmake files to allow $libdir
to even be set.

(From OE-Core rev: a91c417aff129623c49549394810e1a018f92011)

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Kumar Gala 2011-08-03 22:54:05 -05:00 committed by Richard Purdie
parent 378151b53a
commit 3f18bf155f
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
meta/recipes-multimedia/musicbrainz/libmusicbrainz-3.0.3/allow-libdir-override.patch Normal file
View File

@ -0,0 +1,19 @@
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.
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)

7
meta/recipes-multimedia/musicbrainz/libmusicbrainz_3.0.3.bb
View File

@ -6,12 +6,15 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=fbc093901857fcd118f065f900982c24 \
file://include/musicbrainz3/includes.h;beginline=1;endline=21;md5=9ab2846573f560cea7561da472803a72"
DEPENDS = "expat neon"
PR = "r2"
PR = "r3"
SRC_URI = "http://ftp.musicbrainz.org/pub/musicbrainz/${BPN}-${PV}.tar.gz \
file://fix_build_issue_for_gcc_4.5.0.patch "
file://fix_build_issue_for_gcc_4.5.0.patch \
file://allow-libdir-override.patch "
SRC_URI[md5sum] = "f4824d0a75bdeeef1e45cc88de7bb58a"
SRC_URI[sha256sum] = "7fd459a9fd05be9faec60a9a21caa9a1e9fda03147d58d8c7c95f33582a738c5"
inherit cmake pkgconfig
EXTRA_OECMAKE = "-DLIB_INSTALL_DIR:PATH=${libdir}"