]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
Fix duplicate python installation
authorOndřej Surý <ondrej@sury.org>
Wed, 5 Apr 2017 10:26:19 +0000 (12:26 +0200)
committerOndřej Surý <ondrej@sury.org>
Wed, 5 Apr 2017 10:26:19 +0000 (12:26 +0200)
scripts/bootstrap-depends.sh

index 0aa291e33ecf7e3d1ae16855804de4874e53031d..50fd2497f1a10440b2ec4a12d4ee9898c3908537 100755 (executable)
@@ -127,8 +127,14 @@ function pkg {
 PIP_PKGS="dnspython==1.11 cpp-coveralls Jinja2"
 if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
        brew update
-       brew install --force makedepend python hiredis libmemcached protobuf@2.6 protobuf-c cmocka jansson gnutls luajit libuv
+       brew unlink python
+       brew install python
        brew link --overwrite python || true
+       for p in python makedepend hiredis libmemcached protobuf-c cmocka jansson gnutls luajit libuv; do
+               echo "BEGIN $p";
+               brew install $p
+               echo "END $p";
+       done
        pip install --upgrade pip || true
        pip install ${PIP_PKGS}
 fi