godotengine/buildroot
1
0
Fork 0
mirror of https://github.com/godotengine/buildroot.git synced 2026-01-04 06:10:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

package/haproxy: bump to version 1.9.1

Browse Source 
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>
This commit is contained in:
Fabrice Fontaine
2019-01-13 15:04:12 +01:00
committed by Thomas Petazzoni
parent f841001d92
commit 14cb4d2ab3
3 changed files with 5 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
package/haproxy/haproxy.mk
View File

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