conda: update libssh2 libgit2 pygit2 to use anaconda libs instead of system ones

fallen · fallen · commit 4ac79fb10038 · 2015-08-14T16:57:33.000+02:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -7,7 +7,7 @@ source:
   git_tag: v0.22.1
 
 build:
-  number: 0
+  number: 1
 
 requirements:
   build:

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ set CMAKE_GENERATOR=Visual Studio 12 2013`
`7`	`7`	`set CMAKE_GENERATOR=Visual Studio 12 2013 Win64`
`8`	`8`	`)`
`9`	`9`	`set CMAKE_GENERATOR_TOOLSET=v120_xp`
`10`		`-cmake -G "%CMAKE_GENERATOR%" -DCMAKE_INSTALL_PREFIX=%PREFIX% -DSTDCALL=OFF %SRC_DIR%`
	`10`	`+cmake -G "%CMAKE_GENERATOR%" -DCMAKE_INSTALL_PREFIX=%PREFIX% -DSTDCALL=OFF -DCMAKE_PREFIX_PATH=$PREFIX %SRC_DIR%`
`11`	`11`	`if errorlevel 1 exit 1`
`12`	`12`	`REM Build step`
`13`	`13`	`cmake --build .`