From: Jason Ish <ish@unx.ca>
Date: Fri, 17 Mar 2017 17:11:07 +0000 (-0600)
Subject: travis: fix libpcre in mac builds
X-Git-Tag: suricata-4.0.0-beta1~273
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db5708f6ad2a9cf622b30feecaa5030554ec1d38;p=thirdparty%2Fsuricata.git

travis: fix libpcre in mac builds

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.
---

diff --git a/.travis.yml b/.travis.yml
index 409ff648e6..45c53cda71 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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