M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Yann Sionneau 2015-08-14 16:56:46 +02:00
parent 74b9601644
commit 4ac79fb100
7 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conda/libgit2/bld.bat
View File

@ -7,7 +7,7 @@ set CMAKE_GENERATOR=Visual Studio 12 2013
set CMAKE_GENERATOR=Visual Studio 12 2013 Win64 set CMAKE_GENERATOR=Visual Studio 12 2013 Win64
) )
set CMAKE_GENERATOR_TOOLSET=v120_xp 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 if errorlevel 1 exit 1
REM Build step REM Build step
cmake --build . cmake --build .

2
conda/libgit2/build.sh
View File

@ -2,6 +2,6 @@
mkdir build mkdir build
cd build cd build
cmake .. -DCMAKE_INSTALL_PREFIX=$PREFIX cmake .. -DCMAKE_INSTALL_PREFIX=$PREFIX -DCMAKE_PREFIX_PATH=$PREFIX
make -j2 make -j2
make install make install

9
conda/libgit2/meta.yaml
View File

@ -7,12 +7,19 @@ source:
git_tag: v0.22.3 git_tag: v0.22.3
build: build:
number: 0 number: 1
requirements: requirements:
build: build:
- system # [linux] - system # [linux]
- cmake # [linux] - cmake # [linux]
- openssl
- libssh2
- zlib
run:
- openssl
- zlib
- libssh2
about: about:
home: https://libgit2.github.com/ home: https://libgit2.github.com/

2
conda/libssh2/bld.bat
View File

@ -7,7 +7,7 @@ set CMAKE_GENERATOR=Visual Studio 12 2013
set CMAKE_GENERATOR=Visual Studio 12 2013 Win64 set CMAKE_GENERATOR=Visual Studio 12 2013 Win64
) )
set CMAKE_GENERATOR_TOOLSET=v120_xp 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 if errorlevel 1 exit 1
REM Build step REM Build step
cmake --build . cmake --build .

2
conda/libssh2/build.sh
View File

@ -2,6 +2,6 @@
mkdir build mkdir build
cd 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 -j2
make install make install

2
conda/libssh2/meta.yaml
View File

@ -7,7 +7,7 @@ source:
git_tag: libssh2-1.6.0 git_tag: libssh2-1.6.0
build: build:
number: 0 number: 1
requirements: requirements:
build: build:

2
conda/pygit2/meta.yaml
View File

@ -7,7 +7,7 @@ source:
git_tag: v0.22.1 git_tag: v0.22.1
build: build:
number: 0 number: 1
requirements: requirements:
build: build: