diff options
| author | Michael Smith <msmith@cbnco.com> | 2010-09-22 18:36:22 -0400 |
|---|---|---|
| committer | Michael Smith <msmith@cbnco.com> | 2010-09-22 18:39:51 -0400 |
| commit | d4e8b7241d9d5b2e78da2a677874acb7edac8380 (patch) | |
| tree | f9beb232d6bce548df8a5a3b70fa8d34acf6142c | |
| parent | 6aadf6cfe90a0abd0ae9afed8daf8756935f995a (diff) | |
libmusicbrainz: fix build when prefix = ""
Signed-off-by: Michael Smith <msmith@cbnco.com>
| -rw-r--r-- | recipes/musicbrainz/files/libmusicbrainz-3.0.2-cmake-neon.patch | 37 | ||||
| -rw-r--r-- | recipes/musicbrainz/libmusicbrainz_3.0.2.bb | 3 |
2 files changed, 39 insertions, 1 deletions
diff --git a/recipes/musicbrainz/files/libmusicbrainz-3.0.2-cmake-neon.patch b/recipes/musicbrainz/files/libmusicbrainz-3.0.2-cmake-neon.patch new file mode 100644 index 0000000000..a10627548d --- /dev/null +++ b/recipes/musicbrainz/files/libmusicbrainz-3.0.2-cmake-neon.patch @@ -0,0 +1,37 @@ +Upstream: not yet + +Fix build when prefix = "". + +musicbrainz is looking for ne_request.h under ${includedir}. It should be +looking for neon/ne_request.h under ${includedir}, and -I${includedir}/neon +should be added to the compiler flags, as specified by pkg-config. The +existing FindNeon.cmake had a special case to find +/usr/include/neon/ne_request.h so it worked if prefix = "/usr". + +--- libmusicbrainz-3.0.2/cmake/modules/FindNeon.cmake.orig 2007-05-12 07:09:24.000000000 -0400 ++++ libmusicbrainz-3.0.2/cmake/modules/FindNeon.cmake 2010-09-22 18:09:29.000000000 -0400 +@@ -1,10 +1,10 @@ + INCLUDE(UsePkgConfig) + PKGCONFIG(neon _NeonIncDir _NeonLinkDir _NeonLinkFlags _NeonCflags) + +-FIND_PATH(NEON_INCLUDE_DIR ne_request.h ++FIND_PATH(NEON_INCLUDE_DIR neon/ne_request.h + ${_NeonIncDir} +- /usr/include/neon +- /usr/local/include/neon ++ /usr/include ++ /usr/local/include + ) + + FIND_LIBRARY(NEON_LIBRARIES neon +--- libmusicbrainz-3.0.2/src/CMakeLists.txt.orig 2007-07-13 17:16:58.000000000 -0400 ++++ libmusicbrainz-3.0.2/src/CMakeLists.txt 2010-09-22 18:28:46.000000000 -0400 +@@ -1,6 +1,8 @@ + SET(CMAKE_INCLUDE_CURRENT_DIR ON) + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../include ${NEON_INCLUDE_DIR}) + ++ADD_DEFINITIONS(${_NeonCflags}) ++ + FILE(GLOB _sources ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp ${CMAKE_CURRENT_SOURCE_DIR}/xmlParser/*.cpp) + ADD_LIBRARY(musicbrainz3 SHARED ${_sources}) + diff --git a/recipes/musicbrainz/libmusicbrainz_3.0.2.bb b/recipes/musicbrainz/libmusicbrainz_3.0.2.bb index a27ddcb439..52ffe53149 100644 --- a/recipes/musicbrainz/libmusicbrainz_3.0.2.bb +++ b/recipes/musicbrainz/libmusicbrainz_3.0.2.bb @@ -2,7 +2,8 @@ require ${PN}.inc PR = "r1" -SRC_URI_append = " file://libmusicbrainz-3.0.2-gcc-4.4-fix.patch" +SRC_URI_append = " file://libmusicbrainz-3.0.2-gcc-4.4-fix.patch \ + file://libmusicbrainz-3.0.2-cmake-neon.patch" SRC_URI[md5sum] = "648ecd43f7b80852419aaf73702bc23f" |