diff options
| author | Fabrice Fontaine <fontaine.fabrice@gmail.com> | 2018-09-28 19:34:19 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2018-09-30 11:36:03 +0200 |
| commit | 2ee1be2d498d667f56c88e30b9eb6979915d9237 (patch) | |
| tree | f46d35d613054cd7188f671f774f994a5f0962f8 /package/haproxy/haproxy.mk | |
| parent | 1d39d1df19bb05d2cc655229390bf6efdfb5daac (diff) | |
| download | buildroot-2ee1be2d498d667f56c88e30b9eb6979915d9237.tar.gz buildroot-2ee1be2d498d667f56c88e30b9eb6979915d9237.zip | |
haproxy: fix build with pcre2
Add a patch to customize path to pcre-config or pcre2-config instead of
messing with PCREDIR, PCRE2DIR and PCRE2_LDFLAGS variables
Fixes:
- http://autobuild.buildroot.net/results/490bc87b43074623d2338cfd2acb77d5de0abaa6
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/haproxy/haproxy.mk')
| -rw-r--r-- | package/haproxy/haproxy.mk | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/package/haproxy/haproxy.mk b/package/haproxy/haproxy.mk index 5fc7a945b5..a799e69651 100644 --- a/package/haproxy/haproxy.mk +++ b/package/haproxy/haproxy.mk @@ -37,26 +37,15 @@ endif endif # pcre and pcre2 can't be enabled at the same time so prefer pcre2 -# Set PCRE2_DIR as haproxy will otherwise try to use pcre2-config and -# will default to /usr/local ifeq ($(BR2_PACKAGE_PCRE2),y) HAPROXY_DEPENDENCIES += pcre2 HAPROXY_MAKE_OPTS += \ - PCRE2DIR=$(STAGING_DIR)/usr \ + PCRE_CONFIGDIR=$(STAGING_DIR)/usr/bin/ \ USE_PCRE2=1 - -# Again, set manually PCRE2_LDFLAGS or default will contain -L/usr/local -ifeq ($(BR2_PACKAGE_PCRE2_32),y) -HAPROXY_MAKE_OPTS += PCRE2_LDFLAGS=-lpcre2-32 -else ifeq ($(BR2_PACKAGE_PCRE2_16),y) -HAPROXY_MAKE_OPTS += PCRE2_LDFLAGS=-lpcre2-16 -else -HAPROXY_MAKE_OPTS += PCRE2_LDFLAGS=-lpcre2-8 -endif else ifeq ($(BR2_PACKAGE_PCRE),y) HAPROXY_DEPENDENCIES += pcre HAPROXY_MAKE_OPTS += \ - PCREDIR=$(STAGING_DIR)/usr \ + PCRE_CONFIGDIR=$(STAGING_DIR)/usr/bin/ \ USE_PCRE=1 endif |
