libssh: don't do out-of-tree builds manually

cmake.bbclass as of oe-core 783fb88 defaults to out-of-tree builds.  Use that
functionality instead of OECMAKE_BUILDPATH/_SOURCEPATH which are no longer used.

Signed-off-by: Ross Burton <ross.burton@intel.com>
Reviewed-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Ross Burton
2014-01-15 11:37:10 +00:00
committed by Martin Jansa
parent 9fab94b8c3
commit df9bd7592b
+2 -5
View File
@@ -12,20 +12,17 @@ SRC_URI = "git://git.libssh.org/projects/libssh.git;branch=v0-5"
SRCREV = "43914a5f07702fe292a968322d5ff2627e0431db" SRCREV = "43914a5f07702fe292a968322d5ff2627e0431db"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
OECMAKE_BUILDPATH = "${S}/build"
OECMAKE_SOURCEPATH = "${S}"
EXTRA_OECMAKE = " \ EXTRA_OECMAKE = " \
-DWITH_GCRYPT=1 \ -DWITH_GCRYPT=1 \
-DWITH_PCAP=1 \ -DWITH_PCAP=1 \
-DWITH_SFTP=1 \ -DWITH_SFTP=1 \
-DWITH_ZLIB=1 \ -DWITH_ZLIB=1 \
" "
EXTRA_OEMAKE = "-C ${OECMAKE_BUILDPATH}"
inherit cmake inherit cmake
do_configure_prepend () { do_configure_prepend () {
# Disable building of examples # Disable building of examples
sed -i -e '/add_subdirectory(examples)/s/^/#DONOTWANT/' CMakeLists.txt \ sed -i -e '/add_subdirectory(examples)/s/^/#DONOTWANT/' ${S}/CMakeLists.txt \
|| bb_fatal "Failed to disable examples" || bbfatal "Failed to disable examples"
} }