[oe-commits] Ross Burton : libssh: don't do out-of-tree builds manually

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: df9bd7592b4bb1fde01df4db25ee9258c43fed7d
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=df9bd7592b4bb1fde01df4db25ee9258c43fed7d

Author: Ross Burton <ross.burton at intel.com>
Date:   Wed Jan 15 11:37:10 2014 +0000

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 at intel.com>
Reviewed-by: Otavio Salvador <otavio at ossystems.com.br>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-oe/recipes-support/libssh/libssh_git.bb | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/meta-oe/recipes-support/libssh/libssh_git.bb b/meta-oe/recipes-support/libssh/libssh_git.bb
index 73b9ec1..14fd1e4 100644
--- a/meta-oe/recipes-support/libssh/libssh_git.bb
+++ b/meta-oe/recipes-support/libssh/libssh_git.bb
@@ -12,20 +12,17 @@ SRC_URI = "git://git.libssh.org/projects/libssh.git;branch=v0-5"
 SRCREV = "43914a5f07702fe292a968322d5ff2627e0431db"
 S = "${WORKDIR}/git"
 
-OECMAKE_BUILDPATH = "${S}/build"
-OECMAKE_SOURCEPATH = "${S}"
 EXTRA_OECMAKE = " \
     -DWITH_GCRYPT=1 \
     -DWITH_PCAP=1 \
     -DWITH_SFTP=1 \
     -DWITH_ZLIB=1 \
     "
-EXTRA_OEMAKE = "-C ${OECMAKE_BUILDPATH}"
 
 inherit cmake
 
 do_configure_prepend () {
     # Disable building of examples
-    sed -i -e '/add_subdirectory(examples)/s/^/#DONOTWANT/' CMakeLists.txt \
-        || bb_fatal "Failed to disable examples"
+    sed -i -e '/add_subdirectory(examples)/s/^/#DONOTWANT/' ${S}/CMakeLists.txt \
+        || bbfatal "Failed to disable examples"
 }