From 4ac79fb1003839247c148e132c1ed34efdc39097 Mon Sep 17 00:00:00 2001
From: Yann Sionneau <ys@m-labs.hk>
Date: Fri, 14 Aug 2015 16:56:46 +0200
Subject: [PATCH] conda: update libssh2 libgit2 pygit2 to use anaconda libs
 instead of system ones

---
 conda/libgit2/bld.bat   | 2 +-
 conda/libgit2/build.sh  | 2 +-
 conda/libgit2/meta.yaml | 9 ++++++++-
 conda/libssh2/bld.bat   | 2 +-
 conda/libssh2/build.sh  | 2 +-
 conda/libssh2/meta.yaml | 2 +-
 conda/pygit2/meta.yaml  | 2 +-
 7 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/conda/libgit2/bld.bat b/conda/libgit2/bld.bat
index c385a825c..268c18cd9 100644
--- a/conda/libgit2/bld.bat
+++ b/conda/libgit2/bld.bat
@@ -7,7 +7,7 @@ set CMAKE_GENERATOR=Visual Studio 12 2013
 set CMAKE_GENERATOR=Visual Studio 12 2013 Win64
 )
 set CMAKE_GENERATOR_TOOLSET=v120_xp
-cmake -G "%CMAKE_GENERATOR%" -DCMAKE_INSTALL_PREFIX=%PREFIX% -DSTDCALL=OFF %SRC_DIR%
+cmake -G "%CMAKE_GENERATOR%" -DCMAKE_INSTALL_PREFIX=%PREFIX% -DSTDCALL=OFF -DCMAKE_PREFIX_PATH=$PREFIX %SRC_DIR%
 if errorlevel 1 exit 1
 REM Build step
 cmake --build .
diff --git a/conda/libgit2/build.sh b/conda/libgit2/build.sh
index 210fa20ae..dc4a85aa0 100644
--- a/conda/libgit2/build.sh
+++ b/conda/libgit2/build.sh
@@ -2,6 +2,6 @@
 
 mkdir build
 cd build
-cmake .. -DCMAKE_INSTALL_PREFIX=$PREFIX
+cmake .. -DCMAKE_INSTALL_PREFIX=$PREFIX -DCMAKE_PREFIX_PATH=$PREFIX
 make -j2
 make install
diff --git a/conda/libgit2/meta.yaml b/conda/libgit2/meta.yaml
index cfad84964..5741b44b4 100644
--- a/conda/libgit2/meta.yaml
+++ b/conda/libgit2/meta.yaml
@@ -7,12 +7,19 @@ source:
   git_tag: v0.22.3
 
 build:
-  number: 0
+  number: 1
 
 requirements:
   build:
     - system # [linux]
     - cmake # [linux]
+    - openssl
+    - libssh2
+    - zlib
+  run:
+    - openssl
+    - zlib
+    - libssh2
 
 about:
   home: https://libgit2.github.com/
diff --git a/conda/libssh2/bld.bat b/conda/libssh2/bld.bat
index 636211e40..ed957bd42 100644
--- a/conda/libssh2/bld.bat
+++ b/conda/libssh2/bld.bat
@@ -7,7 +7,7 @@ set CMAKE_GENERATOR=Visual Studio 12 2013
 set CMAKE_GENERATOR=Visual Studio 12 2013 Win64
 )
 set CMAKE_GENERATOR_TOOLSET=v120_xp
-cmake -G "%CMAKE_GENERATOR%" -DCMAKE_INSTALL_PREFIX=%PREFIX% -DOPENSSL_ROOT_DIR=%PREFIX%\Library\ %SRC_DIR%
+cmake -G "%CMAKE_GENERATOR%" -DCMAKE_INSTALL_PREFIX=%PREFIX% -DOPENSSL_ROOT_DIR=%PREFIX%\Library -DBUILD_SHARED_LIBS=ON -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF -DCMAKE_PREFIX_PATH=$PREFIX %SRC_DIR%
 if errorlevel 1 exit 1
 REM Build step
 cmake --build .
diff --git a/conda/libssh2/build.sh b/conda/libssh2/build.sh
index a604361f2..773dda78b 100644
--- a/conda/libssh2/build.sh
+++ b/conda/libssh2/build.sh
@@ -2,6 +2,6 @@
 
 mkdir build
 cd build
-cmake .. -DCMAKE_INSTALL_PREFIX=$PREFIX -DOPENSSL_ROOT_DIR=$PREFIX
+cmake .. -DCMAKE_INSTALL_PREFIX=$PREFIX -DOPENSSL_ROOT_DIR=$PREFIX -DBUILD_SHARED_LIBS=ON -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF -DCMAKE_PREFIX_PATH=$PREFIX
 make -j2
 make install
diff --git a/conda/libssh2/meta.yaml b/conda/libssh2/meta.yaml
index 9a65c8f5d..28c0f59b6 100644
--- a/conda/libssh2/meta.yaml
+++ b/conda/libssh2/meta.yaml
@@ -7,7 +7,7 @@ source:
   git_tag: libssh2-1.6.0
 
 build:
-  number: 0
+  number: 1
 
 requirements:
   build:
diff --git a/conda/pygit2/meta.yaml b/conda/pygit2/meta.yaml
index 273c6f444..fcc222f29 100644
--- a/conda/pygit2/meta.yaml
+++ b/conda/pygit2/meta.yaml
@@ -7,7 +7,7 @@ source:
   git_tag: v0.22.1
 
 build:
-  number: 0
+  number: 1
 
 requirements:
   build: