From: DRC <information@libjpeg-turbo.org>
Date: Mon, 8 May 2017 13:15:11 +0000 (-0500)
Subject: Travis: Fix OS X build
X-Git-Tag: 1.5.2~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=70f236ddd7d379eb0077bce7763132fba4983dcd;p=libjpeg-turbo

Travis: Fix OS X build

The Travis xcode7.3 image now apparently includes GnuPG 1.4.x by
default, so use it instead of installing GnuPG 2.  Using GnuPG 2.1.x,
the default version in Homebrew as of this writing, is problematic for
this reason:
https://wiki.archlinux.org/index.php/GnuPG#Unattended_passphrase
---

diff --git a/.travis.yml b/.travis.yml
index 53ded2b..c1e36bd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,7 +43,8 @@ matrix:
 
 before_install:
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then
-      brew install nasm homebrew/versions/gcc5 md5sha1sum Caskroom/versions/java6 gpg &&
+      brew install nasm homebrew/versions/gcc5 md5sha1sum Caskroom/versions/java6 &&
+      ln -fs /usr/local/bin/gpg1 /usr/local/bin/gpg &&
       git clone --depth=1 https://github.com/libjpeg-turbo/gas-preprocessor.git ~/src/gas-preprocessor &&
       ln -fs /Applications/Xcode.app /Applications/Xcode72.app;
     fi