From: Daniel P. Berrangé <berrange@redhat.com>
Date: Wed, 27 Nov 2019 13:46:54 +0000 (+0000)
Subject: travis: explicitly require xcode 10.3 image for macOS
X-Git-Tag: v5.10.0-rc2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1b285196a2a3d8f72513b0329f2da3cf961734c7;p=thirdparty%2Flibvirt.git

travis: explicitly require xcode 10.3 image for macOS

The default macOS image in travis is broken, throwing python
exceptions when trying to install glib. Explicitly ask for the
newer 10.3 image which works correctly.

We now need to also point to the homebrew installed libxml2
rather than the OS distro provided one, since the OS distro
one has a pkg-config file present, but no actual header
files.

Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/.travis.yml b/.travis.yml
index 75f32e53b9..80f3be5490 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,8 +62,10 @@ matrix:
     - compiler: clang
       language: c
       os: osx
+      osx_image: xcode10.3
       env:
         - PATH="/usr/local/opt/gettext/bin:/usr/local/opt/ccache/libexec:/usr/local/opt/rpcgen/bin:$PATH"
+        - PKG_CONFIG_PATH="/usr/local/opt/libxml2/lib/pkgconfig"
       script:
         # We can't run 'distcheck' or 'syntax-check' because they fail on
         # macOS, but doing 'install' and 'dist' gives us some useful coverage