Patchwork [meta-oe,3/5] libssh: don't do out-of-tree builds manually

login
register
mail settings
Submitter Ross Burton
Date Jan. 15, 2014, 11:37 a.m.
Message ID <1389785832-3120-3-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/64887/
State Accepted, archived
Headers show

Comments

Ross Burton - Jan. 15, 2014, 11:37 a.m.
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>
---
 meta-oe/recipes-support/libssh/libssh_git.bb |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
Otavio Salvador - Jan. 15, 2014, 11:44 a.m.
On Wed, Jan 15, 2014 at 9:37 AM, Ross Burton <ross.burton@intel.com> wrote:

> 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>

Patch

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"
 }