summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2011-08-03 22:54:05 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-05 17:16:00 +0100
commit3f18bf155fa38a8c21f1bdc09e7abf0ab05e2f9f (patch)
tree8c29ed51dd05ddbd00cde36ea6c6c3e7baca7c05
parent378151b53a9509224029f160f0d119a5bc2402c5 (diff)
downloadpoky-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>
-rw-r--r--meta/recipes-multimedia/musicbrainz/libmusicbrainz-3.0.3/allow-libdir-override.patch19
-rw-r--r--meta/recipes-multimedia/musicbrainz/libmusicbrainz_3.0.3.bb7
2 files changed, 24 insertions, 2 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 @@
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
5Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
6
7Index: 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)
diff --git a/meta/recipes-multimedia/musicbrainz/libmusicbrainz_3.0.3.bb b/meta/recipes-multimedia/musicbrainz/libmusicbrainz_3.0.3.bb
index d6fb2f45ed..4814b6d2c7 100644
--- a/meta/recipes-multimedia/musicbrainz/libmusicbrainz_3.0.3.bb
+++ b/meta/recipes-multimedia/musicbrainz/libmusicbrainz_3.0.3.bb
@@ -6,12 +6,15 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=fbc093901857fcd118f065f900982c24 \
6 file://include/musicbrainz3/includes.h;beginline=1;endline=21;md5=9ab2846573f560cea7561da472803a72" 6 file://include/musicbrainz3/includes.h;beginline=1;endline=21;md5=9ab2846573f560cea7561da472803a72"
7DEPENDS = "expat neon" 7DEPENDS = "expat neon"
8 8
9PR = "r2" 9PR = "r3"
10 10
11SRC_URI = "http://ftp.musicbrainz.org/pub/musicbrainz/${BPN}-${PV}.tar.gz \ 11SRC_URI = "http://ftp.musicbrainz.org/pub/musicbrainz/${BPN}-${PV}.tar.gz \
12 file://fix_build_issue_for_gcc_4.5.0.patch " 12 file://fix_build_issue_for_gcc_4.5.0.patch \
13 file://allow-libdir-override.patch "
13 14
14SRC_URI[md5sum] = "f4824d0a75bdeeef1e45cc88de7bb58a" 15SRC_URI[md5sum] = "f4824d0a75bdeeef1e45cc88de7bb58a"
15SRC_URI[sha256sum] = "7fd459a9fd05be9faec60a9a21caa9a1e9fda03147d58d8c7c95f33582a738c5" 16SRC_URI[sha256sum] = "7fd459a9fd05be9faec60a9a21caa9a1e9fda03147d58d8c7c95f33582a738c5"
16 17
17inherit cmake pkgconfig 18inherit cmake pkgconfig
19
20EXTRA_OECMAKE = "-DLIB_INSTALL_DIR:PATH=${libdir}"