]> granicus.if.org Git - libjpeg-turbo/commitdiff
Travis: Fix OS X build
authorDRC <information@libjpeg-turbo.org>
Mon, 8 May 2017 13:15:11 +0000 (08:15 -0500)
committerDRC <information@libjpeg-turbo.org>
Mon, 8 May 2017 19:42:52 +0000 (14:42 -0500)
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

.travis.yml

index 53ded2b9502b90a83c705233fe02985790b3c7ce..c1e36bdc9617ede5fc166fda27cce64cfc17965b 100644 (file)
@@ -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