diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2011-08-03 22:54:05 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-05 17:16:00 +0100 |
commit | 3f18bf155fa38a8c21f1bdc09e7abf0ab05e2f9f (patch) | |
tree | 8c29ed51dd05ddbd00cde36ea6c6c3e7baca7c05 /meta/recipes-multimedia/musicbrainz/libmusicbrainz-3.0.3 | |
parent | 378151b53a9509224029f160f0d119a5bc2402c5 (diff) | |
download | poky-3f18bf155fa38a8c21f1bdc09e7abf0ab05e2f9f.tar.gz |
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>
Diffstat (limited to 'meta/recipes-multimedia/musicbrainz/libmusicbrainz-3.0.3')
-rw-r--r-- | meta/recipes-multimedia/musicbrainz/libmusicbrainz-3.0.3/allow-libdir-override.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/musicbrainz/libmusicbrainz-3.0.3/allow-libdir-override.patch b/meta/recipes-multimedia/musicbrainz/libmusicbrainz-3.0.3/allow-libdir-override.patch new file mode 100644 index 0000000000..88f414ae05 --- /dev/null +++ b/meta/recipes-multimedia/musicbrainz/libmusicbrainz-3.0.3/allow-libdir-override.patch | |||
@@ -0,0 +1,19 @@ | |||
1 | Allow LIB_INSTALL_DIR to be set by the the cmake configure invocation. We dont | ||
2 | easily have a way of determining something that patches ${LIB_SUFFIX} so we'll | ||
3 | set LIB_INSTALL_DIR. | ||
4 | |||
5 | Signed-off-by: Kumar Gala <galak@kernel.crashing.org> | ||
6 | |||
7 | Index: libmusicbrainz-3.0.3/CMakeLists.txt | ||
8 | =================================================================== | ||
9 | --- libmusicbrainz-3.0.3.orig/CMakeLists.txt | ||
10 | +++ libmusicbrainz-3.0.3/CMakeLists.txt | ||
11 | @@ -26,7 +26,7 @@ FIND_PACKAGE(DiscId) | ||
12 | SET(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)") | ||
13 | SET(EXEC_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Installation prefix for executables and object code libraries" FORCE) | ||
14 | SET(BIN_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/bin CACHE PATH "Installation prefix for user executables" FORCE) | ||
15 | -SET(LIB_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH "Installation prefix for object code libraries" FORCE) | ||
16 | +SET(LIB_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH "Installation prefix for object code libraries") | ||
17 | SET(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include CACHE PATH "Installation prefix for C header files" FORCE) | ||
18 | |||
19 | CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libmusicbrainz3.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libmusicbrainz3.pc) | ||