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:12:59 +0100 |
| commit | a91c417aff129623c49549394810e1a018f92011 (patch) | |
| tree | a612029c0afec9ad7d8fc992ef1a8905843dab43 /meta/recipes-multimedia/musicbrainz/libmusicbrainz-3.0.3 | |
| parent | e9a49ebe3a1c83aa022eb07f3ca87b3d71c742f9 (diff) | |
| download | openembedded-core-a91c417aff129623c49549394810e1a018f92011.tar.gz openembedded-core-a91c417aff129623c49549394810e1a018f92011.tar.bz2 openembedded-core-a91c417aff129623c49549394810e1a018f92011.zip | |
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.
Signed-off-by: Kumar Gala <galak@kernel.crashing.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 @@ +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) |