From ff4ee38a514e6afde2b1c9ada40552aa22556fea Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Mon, 6 Oct 2014 14:40:33 -0400
Subject: [PATCH] contrib: don't trust pkg-config for pcre on OSX

Refs #56954

Change-Id: I1db4fe3ae0e011562b551efd1808cb7aec3490e1
---
 daemon/contrib/src/pcre/rules.mak | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/daemon/contrib/src/pcre/rules.mak b/daemon/contrib/src/pcre/rules.mak
index 1cfd5d6f0f..d30cee780d 100644
--- a/daemon/contrib/src/pcre/rules.mak
+++ b/daemon/contrib/src/pcre/rules.mak
@@ -4,9 +4,13 @@ PCRE_VERSION := 8.35
 PCRE_URL := ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$(PCRE_VERSION).tar.bz2
 
 PKGS += pcre
+
+# OS X ships with improperly packaged libpcre, so we can't rely on pkg-config
+ifndef HAVE_MACOSX
 ifeq ($(call need_pkg,"libpcre"),)
 PKGS_FOUND += pcre
 endif
+endif
 
 $(TARBALLS)/pcre-$(PCRE_VERSION).tar.bz2:
 	$(call download,$(PCRE_URL))
-- 
GitLab