]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
travis: fix libpcre in mac builds
authorJason Ish <ish@unx.ca>
Fri, 17 Mar 2017 17:11:07 +0000 (11:11 -0600)
committerVictor Julien <victor@inliniac.net>
Fri, 24 Mar 2017 13:02:13 +0000 (14:02 +0100)
It looks like Travis changed their Mac image and pcre is now
installed by default. In case it gets removed again, just unlink
it before re-installing so it doesn't fail on install.

.travis.yml

index 409ff648e6f6db58c8b16ef7b1279b70520009e3..45c53cda71b92db32f7f46b58199402330bbff00 100644 (file)
@@ -126,6 +126,10 @@ before_install:
   - |
     if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
         brew update
+
+        # Unlink pcre in case its already installed.
+        brew unlink pcre || true
+
         brew install pkg-config libmagic libyaml nss nspr jansson libnet lua \
             pcre hiredis
     fi