summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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