]> xenbits.xensource.com Git - libvirt.git/commitdiff
travis: Uninstall packages before upgrade
authorAndrea Bolognani <abologna@redhat.com>
Mon, 14 May 2018 07:45:10 +0000 (09:45 +0200)
committerAndrea Bolognani <abologna@redhat.com>
Mon, 14 May 2018 10:33:04 +0000 (12:33 +0200)
numpy (needed by cgal) started having the same issue with
linking as python, which makes upgrade and thus the entire
build fail on macOS.

Instead of playing more tricks with linking/unlinking, just
uninstall the problematic packages (and those dragging them
in) before doing anything else.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
.travis.yml

index d3f72d46f3d9bb9930abff9e10b83cff810ec3f0..140072b80199c1e73bce05234e88d76ee712c82b 100644 (file)
@@ -21,10 +21,10 @@ matrix:
     - compiler: clang
       os: osx
       before_install:
+        - brew uninstall python mercurial postgis sfcgal cgal gdal
         - brew update
-        - brew unlink python
         - brew upgrade
-        - brew install rpcgen yajl
+        - brew install python rpcgen yajl
       script:
         # We can't run make distcheck/syntax-check because they
         # fail on macOS, but doing 'install' and 'dist' gives us