diff options
| author | Fabrice Fontaine <fontaine.fabrice@gmail.com> | 2019-01-13 15:04:12 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@bootlin.com> | 2019-01-13 21:53:51 +0100 |
| commit | 14cb4d2ab35b6a94b61888b9ff8b4f0300bbaae8 (patch) | |
| tree | ae91f4cf35f001de7bcf182d0b5b69061c0b8df3 /package/haproxy/haproxy.mk | |
| parent | f841001d92eda46ac536ad0a811506098cd5a3f7 (diff) | |
| download | buildroot-14cb4d2ab35b6a94b61888b9ff8b4f0300bbaae8.tar.gz buildroot-14cb4d2ab35b6a94b61888b9ff8b4f0300bbaae8.zip | |
package/haproxy: bump to version 1.9.1
Remove patch and tweak haproxy.mk to adapt pcre-config/pcre2-config
workaround with upstream solution.
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Diffstat (limited to 'package/haproxy/haproxy.mk')
| -rw-r--r-- | package/haproxy/haproxy.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package/haproxy/haproxy.mk b/package/haproxy/haproxy.mk index 061a8cbbaf..e382f61f8e 100644 --- a/package/haproxy/haproxy.mk +++ b/package/haproxy/haproxy.mk @@ -4,8 +4,8 @@ # ################################################################################ -HAPROXY_VERSION_MAJOR = 1.8 -HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).14 +HAPROXY_VERSION_MAJOR = 1.9 +HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).1 HAPROXY_SITE = http://www.haproxy.org/download/$(HAPROXY_VERSION_MAJOR)/src HAPROXY_LICENSE = GPL-2.0+ and LGPL-2.1+ with exceptions HAPROXY_LICENSE_FILES = LICENSE doc/lgpl.txt doc/gpl.txt @@ -48,12 +48,12 @@ endif ifeq ($(BR2_PACKAGE_PCRE2),y) HAPROXY_DEPENDENCIES += pcre2 HAPROXY_MAKE_OPTS += \ - PCRE_CONFIGDIR=$(STAGING_DIR)/usr/bin/ \ + PCRE2_CONFIG=$(STAGING_DIR)/usr/bin/pcre2-config \ USE_PCRE2=1 else ifeq ($(BR2_PACKAGE_PCRE),y) HAPROXY_DEPENDENCIES += pcre HAPROXY_MAKE_OPTS += \ - PCRE_CONFIGDIR=$(STAGING_DIR)/usr/bin/ \ + PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre-config \ USE_PCRE=1 endif |
