summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYu Ke <ke.yu@intel.com>2011-07-13 16:57:39 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-13 12:14:20 +0100
commit4e01f730bf1840d43ae7f95bbf51d85d7d030493 (patch)
tree2e41e1deff1c14d67b352f8e58399ecfb1331bdc
parentc3a8e964a5706640ce0df8148b4934d20b72425e (diff)
downloadpoky-4e01f730bf1840d43ae7f95bbf51d85d7d030493.tar.gz
sat-solver: fix for non /usr/lib libdir case
when libdir set to non /usr/lib like /usr/lib64, there is do_configure error: " -- Libraries will be installed in /usr/lib CMake Error at /home/kyu3/sdb/lib64/tmp/sysroots/x86_64-linux/usr/share/cmake-2.8/Modules/FindPackageHandleStandardArgs.cmake:91 (MESSAGE): Please install 'check' and 'check-devel' packages (missing: CHECK_LIBRARY) Call Stack (most recent call first): /home/kyu3/sdb/lib64/tmp/sysroots/x86_64-linux/usr/share/cmake-2.8/Modules/FindPackageHandleStandardArgs.cmake:252 (_FPHSA_FAILURE_MESSAGE) cmake/modules/FindCheck.cmake:17 (FIND_PACKAGE_HANDLE_STANDARD_ARGS) CMakeLists.txt:35 (FIND_PACKAGE) -- Configuring incomplete, errors occurred! " The reason is that cmake did not search /usr/lib64 for libcheck, thus report error add ${libdir} to the CMAKE_SYSTEM_LIBRARY_PATH can fix this issue. (From OE-Core rev: f4de87ce30a37bb2f09855d442b34d153ada8c0e) Signed-off-by: Yu Ke <ke.yu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/cmake.bbclass4
-rw-r--r--meta/recipes-extended/sat-solver/sat-solver_git.bb6
2 files changed, 8 insertions, 2 deletions
diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index 672325e2d5..5ac540cfcc 100644
--- a/meta/classes/cmake.bbclass
+++ b/meta/classes/cmake.bbclass
@@ -55,6 +55,10 @@ set( CMAKE_INSTALL_RPATH ${OECMAKE_RPATH} )
55 55
56# Use native cmake modules 56# Use native cmake modules
57set( CMAKE_MODULE_PATH ${STAGING_DATADIR}/cmake/Modules/ ) 57set( CMAKE_MODULE_PATH ${STAGING_DATADIR}/cmake/Modules/ )
58
59# add for non /usr/lib libdir, e.g. /usr/lib64
60LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH ${libdir})
61
58EOF 62EOF
59} 63}
60 64
diff --git a/meta/recipes-extended/sat-solver/sat-solver_git.bb b/meta/recipes-extended/sat-solver/sat-solver_git.bb
index c608bb7cc2..9b212dbf03 100644
--- a/meta/recipes-extended/sat-solver/sat-solver_git.bb
+++ b/meta/recipes-extended/sat-solver/sat-solver_git.bb
@@ -8,7 +8,7 @@ DEPENDS = "libcheck rpm zlib expat db"
8 8
9SRCREV = "0a7378d5f482f477a01cf1690d76871ab8bdcc32" 9SRCREV = "0a7378d5f482f477a01cf1690d76871ab8bdcc32"
10PV = "0.0-git${SRCPV}" 10PV = "0.0-git${SRCPV}"
11PR = "r10" 11PR = "r11"
12 12
13PARALLEL_MAKE="" 13PARALLEL_MAKE=""
14 14
@@ -23,7 +23,9 @@ SRC_URI = "git://gitorious.org/opensuse/sat-solver.git;protocol=git \
23 23
24S = "${WORKDIR}/git" 24S = "${WORKDIR}/git"
25 25
26EXTRA_OECMAKE += "-DLIB=lib -DRPM5=RPM5 -DOE_CORE=OE_CORE" 26EXTRA_OECMAKE += "-DRPM5=RPM5 -DOE_CORE=OE_CORE"
27
28EXTRA_OECMAKE += " -DLIB=${@os.path.basename('${libdir}')}"
27 29
28inherit cmake pkgconfig 30inherit cmake pkgconfig
29 31