From: Andrea Bolognani <abologna@redhat.com>
Date: Mon, 14 May 2018 07:45:10 +0000 (+0200)
Subject: travis: Uninstall packages before upgrade
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=57b8df921978430defc34c105d8e223761e08e8e;p=libvirt.git

travis: Uninstall packages before upgrade

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>
---

diff --git a/.travis.yml b/.travis.yml
index d3f72d46f3..140072b801 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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