diff options
author | Ross Burton <ross.burton@intel.com> | 2014-01-15 11:37:10 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-01-22 12:22:35 +0100 |
commit | df9bd7592b4bb1fde01df4db25ee9258c43fed7d (patch) | |
tree | 85c145e7beb86f5dfd92f687e0a393c3e49c347d /meta-oe/recipes-support/libssh | |
parent | 9fab94b8c3b313d9787c3a0537d17d765ccd5ae3 (diff) | |
download | meta-openembedded-df9bd7592b4bb1fde01df4db25ee9258c43fed7d.tar.gz |
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>
Diffstat (limited to 'meta-oe/recipes-support/libssh')
-rw-r--r-- | meta-oe/recipes-support/libssh/libssh_git.bb | 7 |
1 files 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 73b9ec1f4..14fd1e4fd 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" | |||
12 | SRCREV = "43914a5f07702fe292a968322d5ff2627e0431db" | 12 | SRCREV = "43914a5f07702fe292a968322d5ff2627e0431db" |
13 | S = "${WORKDIR}/git" | 13 | S = "${WORKDIR}/git" |
14 | 14 | ||
15 | OECMAKE_BUILDPATH = "${S}/build" | ||
16 | OECMAKE_SOURCEPATH = "${S}" | ||
17 | EXTRA_OECMAKE = " \ | 15 | EXTRA_OECMAKE = " \ |
18 | -DWITH_GCRYPT=1 \ | 16 | -DWITH_GCRYPT=1 \ |
19 | -DWITH_PCAP=1 \ | 17 | -DWITH_PCAP=1 \ |
20 | -DWITH_SFTP=1 \ | 18 | -DWITH_SFTP=1 \ |
21 | -DWITH_ZLIB=1 \ | 19 | -DWITH_ZLIB=1 \ |
22 | " | 20 | " |
23 | EXTRA_OEMAKE = "-C ${OECMAKE_BUILDPATH}" | ||
24 | 21 | ||
25 | inherit cmake | 22 | inherit cmake |
26 | 23 | ||
27 | do_configure_prepend () { | 24 | do_configure_prepend () { |
28 | # Disable building of examples | 25 | # Disable building of examples |
29 | sed -i -e '/add_subdirectory(examples)/s/^/#DONOTWANT/' CMakeLists.txt \ | 26 | sed -i -e '/add_subdirectory(examples)/s/^/#DONOTWANT/' ${S}/CMakeLists.txt \ |
30 | || bb_fatal "Failed to disable examples" | 27 | || bbfatal "Failed to disable examples" |
31 | } | 28 | } |