From c67b4178492fc5d147166b262b27c2722fe31426 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Mon, 15 May 2017 18:05:13 +0200 Subject: [PATCH 1/2] Travis CI: Limit CUDA packages to install --- .travis.yml | 2 +- scripts/install-cuda-trusty.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8e72be423..91eee440d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,5 +22,5 @@ script: - cmake --build build - build/ethminer/ethminer --list-devices -G - build/ethminer/ethminer --list-devices -U - - if [ "$TRAVIS_OS_NAME" = linux ]; then ldd build/ethminer/ethminer; fi + - if [ "$TRAVIS_OS_NAME" = linux ]; then ldd -v build/ethminer/ethminer; fi - if [ "$TRAVIS_OS_NAME" = osx ]; then otool -L build/ethminer/ethminer; fi diff --git a/scripts/install-cuda-trusty.sh b/scripts/install-cuda-trusty.sh index 19dd10411..9605cc63b 100755 --- a/scripts/install-cuda-trusty.sh +++ b/scripts/install-cuda-trusty.sh @@ -14,7 +14,7 @@ travis_retry sudo dpkg -i cuda-repo-ubuntu1404_${CUDA_VER}_amd64.deb travis_retry sudo apt-get update -qq export CUDA_APT=${CUDA_VER:0:3} export CUDA_APT=${CUDA_APT/./-} -travis_retry sudo apt-get install -y cuda-drivers cuda-core-${CUDA_APT} cuda-cudart-dev-${CUDA_APT} cuda-cufft-dev-${CUDA_APT} +travis_retry sudo apt-get install -qy cuda-drivers cuda-core-${CUDA_APT} cuda-cudart-dev-${CUDA_APT} travis_retry sudo apt-get clean export CUDA_HOME=/usr/local/cuda-${CUDA_VER:0:3} export PATH=${CUDA_HOME}/bin:${PATH} From ea7447feaea93f6927fda506d46c6fac28de09ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Mon, 15 May 2017 18:58:37 +0200 Subject: [PATCH 2/2] Build CURL with HTTP support only --- CMakeLists.txt | 1 + cmake/Hunter/config.cmake | 1 + 2 files changed, 2 insertions(+) create mode 100644 cmake/Hunter/config.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 7f4ac8ae7..1aeb16f78 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,7 @@ include(HunterGate) HunterGate( URL "https://github.com/ruslo/hunter/archive/v0.18.46.tar.gz" SHA1 "e368cbf2a98cf8b8fa7a379fde74eca8ded425e3" + LOCAL ) diff --git a/cmake/Hunter/config.cmake b/cmake/Hunter/config.cmake new file mode 100644 index 000000000..1eb5cf482 --- /dev/null +++ b/cmake/Hunter/config.cmake @@ -0,0 +1 @@ +hunter_config(CURL VERSION ${HUNTER_CURL_VERSION} CMAKE_ARGS HTTP_ONLY=ON) \ No newline at end of file