aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongjun Ni <hongjun.ni@intel.com>2019-01-23 06:18:28 +0000
committerGerrit Code Review <gerrit@fd.io>2019-01-23 06:18:28 +0000
commiteee2e5e0e00412f1456cd48755229680517ee69c (patch)
tree1dbbdc1e12e74bfb7d1697d292318562dfb638cd
parent28feac42492feb3a1f9f02d88cb410d137d2504f (diff)
parent1ac5888819a7d4db806264e4b2bb6ed155e87ca1 (diff)
Merge "libssh version too low in ubuntu 16, build from source"
-rw-r--r--Makefile9
1 files changed, 7 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index bce9130..94dab5d 100644
--- a/Makefile
+++ b/Makefile
@@ -38,9 +38,9 @@ endif
DEB_DEPENDS = curl build-essential autoconf automake ccache
DEB_DEPENDS += bison flex libpcre3-dev libev-dev libavl-dev libprotobuf-c-dev protobuf-c-compiler libcmocka-dev
-DEB_DEPENDS += cmake ninja-build libssh-dev python-pkgconfig swig python-dev libssl-dev
+DEB_DEPENDS += cmake ninja-build python-pkgconfig python-dev libssl-dev
-RPM_DEPENDS = curl autoconf automake ccache bison flex pcre-devel libev-devel protobuf-c-devel protobuf-c-compiler libcmocka-devel cmake ninja-build libssh-devel python-pkgconfig python-devel openssl-devel graphviz wget
+RPM_DEPENDS = curl autoconf automake ccache bison flex pcre-devel libev-devel protobuf-c-devel protobuf-c-compiler libcmocka-devel cmake ninja-build python-pkgconfig python-devel openssl-devel graphviz wget gcc gcc-c++
ifeq ($(findstring y,$(UNATTENDED)),y)
CONFIRM=-y
@@ -133,6 +133,11 @@ endif
@rm -rf $(BR)/downloads
@mkdir -p $(BR)/downloads/&&cd $(BR)/downloads/\
\
+ &&wget https://git.libssh.org/projects/libssh.git/snapshot/libssh-0.7.5.tar.gz\
+ &&tar xvf libssh-0.7.5.tar.gz && cd libssh-0.7.5 && mkdir build && cd build\
+ &&cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr ..\
+ &&make&&sudo make install && sudo ldconfig&&cd ../../\
+ \
&&wget https://github.com/CESNET/libyang/archive/v0.16-r3.tar.gz\
&&tar xvf v0.16-r3.tar.gz && cd libyang-0.16-r3 && mkdir -p build&& cd build\
&&cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_BUILD_TESTS=OFF -DCMAKE_INSTALL_PREFIX:PATH=/usr ..\