bslathi19/buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

haproxy: fix build with pcre2

Browse Source 
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>
This commit is contained in:
Fabrice Fontaine
2018-09-28 19:34:19 +02:00
committed by Peter Korsgaard
parent 1d39d1df19
commit 2ee1be2d49
2 changed files with 58 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
package/haproxy/haproxy.mk
View File

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