From 3847f91122b790082e3d5d3b6f5f054dc2fbd237 Mon Sep 17 00:00:00 2001 From: Stephen Date: Wed, 3 Jan 2018 07:56:12 -0800 Subject: [PATCH] Travis/OS X: Use 'brew bundle' + Brewfile This ensures that the build script will not fail if the Homebrew dependencies are already installed. --- .travis.yml | 2 +- Brewfile | 4 ++++ Makefile.am | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 Brewfile diff --git a/.travis.yml b/.travis.yml index f273012f4..55df6daaa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,7 +44,7 @@ matrix: before_install: - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update && - brew install nasm homebrew/versions/gcc5 md5sha1sum Caskroom/versions/java6 && + brew bundle && 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; diff --git a/Brewfile b/Brewfile new file mode 100644 index 000000000..02d845778 --- /dev/null +++ b/Brewfile @@ -0,0 +1,4 @@ +brew 'nasm' +brew 'gcc@5' +brew 'md5sha1sum' +cask 'Caskroom/versions/java6' diff --git a/Makefile.am b/Makefile.am index 8043f0968..0c2d25346 100644 --- a/Makefile.am +++ b/Makefile.am @@ -174,7 +174,7 @@ EXTRA_DIST = win release $(DOCS) testimages CMakeLists.txt \ sharedlib/CMakeLists.txt cmakescripts libjpeg.map.in doc doxygen.config \ doxygen-extra.css jccolext.c jdcolext.c jdcol565.c jdmrgext.c jdmrg565.c \ jstdhuff.c jdcoefct.h jdmainct.h jdmaster.h jdsample.h \ - md5/CMakeLists.txt + md5/CMakeLists.txt Brewfile dist-hook: rm -rf `find $(distdir) -name .svn`