NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3a487174cc
kumquat-buildroot/package/haproxy/haproxy.mk

89 lines
2.2 KiB
Makefile
Raw Normal View History

haproxy: new package HAProxy is a free, very fast and reliable solution offering high availability, load balancing, and proxying for TCP and HTTP-based applications. http://www.haproxy.org Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2018-09-21 22:56:19 +02:00
################################################################################
#
# haproxy
#
################################################################################
package/haproxy: bump to version 2.1.2 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2020-02-03 21:52:56 +01:00
HAPROXY_VERSION_MAJOR = 2.1
package/haproxy: security bump to version 2.1.4 - Fix CVE-2020-11100: In hpack_dht_insert in hpack-tbl.c in the HPACK decoder in HAProxy 1.8 through 2.x before 2.1.4, a remote attacker can write arbitrary bytes around a certain location on the heap via a crafted HTTP/2 request, possibly causing remote code execution. - Update indentation of hash file (two spaces) Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2020-04-08 23:00:06 +02:00
HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).4
haproxy: new package HAProxy is a free, very fast and reliable solution offering high availability, load balancing, and proxying for TCP and HTTP-based applications. http://www.haproxy.org Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2018-09-21 22:56:19 +02:00
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
HAPROXY_MAKE_OPTS = \
LD=$(TARGET_CC) \
PREFIX=/usr \
TARGET=custom
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
HAPROXY_LIBS += -latomic
endif
package/haproxy: fix build on m68k When threads are enabled, haproxy expects that pthread_getcpuclockid is available which is not the case on m68k. Fix this by enabling threads support only if NPTL is available. Fixes: - http://autobuild.buildroot.org/results/52cc4b1fcac2a4fc84ab15ec4c692d2cd9b6d8bd Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2019-11-01 12:10:05 +01:00
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS_NPTL),y)
haproxy: tweak thread activation If threads are enabled, as described in include/common/hathreads.h, haproxy uses __sync_*_4 intrisics if gcc < 4.7. Otherwise, haproxy uses __atomic_ intrinsics. As a result, instead of adding a dependency on BR2_TOOLCHAIN_HAS_SYNC_4 and BR2_TOOLCHAIN_HAS_ATOMIC in Config.in, enable threads only if the dependencies are fulfilled in haproxy.mk Fixes: - http://autobuild.buildroot.org/results/7f24873ecdd9246c95c03bb8d2fcd4c16c488c6c Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2018-10-02 21:28:58 +02:00
# threads uses atomics on gcc >= 4.7 and sync otherwise (see
# include/common/hathreads.h)
ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_7):$(BR2_TOOLCHAIN_HAS_ATOMIC),y:y)
haproxy: new package HAProxy is a free, very fast and reliable solution offering high availability, load balancing, and proxying for TCP and HTTP-based applications. http://www.haproxy.org Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2018-09-21 22:56:19 +02:00
HAPROXY_MAKE_OPTS += USE_THREAD=1
haproxy: tweak thread activation If threads are enabled, as described in include/common/hathreads.h, haproxy uses __sync_*_4 intrisics if gcc < 4.7. Otherwise, haproxy uses __atomic_ intrinsics. As a result, instead of adding a dependency on BR2_TOOLCHAIN_HAS_SYNC_4 and BR2_TOOLCHAIN_HAS_ATOMIC in Config.in, enable threads only if the dependencies are fulfilled in haproxy.mk Fixes: - http://autobuild.buildroot.org/results/7f24873ecdd9246c95c03bb8d2fcd4c16c488c6c Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2018-10-02 21:28:58 +02:00
else ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_7):$(BR2_TOOLCHAIN_HAS_SYNC_4),:y)
HAPROXY_MAKE_OPTS += USE_THREAD=1
endif
haproxy: new package HAProxy is a free, very fast and reliable solution offering high availability, load balancing, and proxying for TCP and HTTP-based applications. http://www.haproxy.org Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2018-09-21 22:56:19 +02:00
endif
ifeq ($(BR2_PACKAGE_LUA_5_3),y)
HAPROXY_DEPENDENCIES += lua
haproxy: fix linking with lua Use LUA_LIB_NAME to give lua library name otherwise haproxy can't find it Fixes: - http://autobuild.buildroot.net/results/28b6672188bb0082ac1467d3b45904880e3634f3 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2018-09-28 19:35:19 +02:00
HAPROXY_MAKE_OPTS += \
LUA_LIB_NAME=lua \
USE_LUA=1
haproxy: new package HAProxy is a free, very fast and reliable solution offering high availability, load balancing, and proxying for TCP and HTTP-based applications. http://www.haproxy.org Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2018-09-21 22:56:19 +02:00
endif
ifeq ($(BR2_PACKAGE_OPENSSL),y)
HAPROXY_DEPENDENCIES += openssl
HAPROXY_MAKE_OPTS += USE_OPENSSL=1
ifeq ($(BR2_STATIC_LIBS),y)
HAPROXY_LIBS += -lz
endif
endif
# pcre and pcre2 can't be enabled at the same time so prefer pcre2
ifeq ($(BR2_PACKAGE_PCRE2),y)
HAPROXY_DEPENDENCIES += pcre2
HAPROXY_MAKE_OPTS += \
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>
2019-01-13 15:04:12 +01:00
PCRE2_CONFIG=$(STAGING_DIR)/usr/bin/pcre2-config \
haproxy: new package HAProxy is a free, very fast and reliable solution offering high availability, load balancing, and proxying for TCP and HTTP-based applications. http://www.haproxy.org Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2018-09-21 22:56:19 +02:00
USE_PCRE2=1
else ifeq ($(BR2_PACKAGE_PCRE),y)
HAPROXY_DEPENDENCIES += pcre
HAPROXY_MAKE_OPTS += \
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>
2019-01-13 15:04:12 +01:00
PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre-config \
haproxy: new package HAProxy is a free, very fast and reliable solution offering high availability, load balancing, and proxying for TCP and HTTP-based applications. http://www.haproxy.org Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2018-09-21 22:56:19 +02:00
USE_PCRE=1
endif
ifeq ($(BR2_PACKAGE_SYSTEMD),y)
HAPROXY_DEPENDENCIES += systemd
HAPROXY_MAKE_OPTS += USE_SYSTEMD=1
endif
ifeq ($(BR2_PACKAGE_ZLIB),y)
HAPROXY_DEPENDENCIES += zlib
HAPROXY_MAKE_OPTS += USE_ZLIB=1
endif
HAPROXY_MAKE_OPTS += ADDLIB="$(HAPROXY_LIBS)"
package/haproxy: re-enable package on microblaze With Microblaze ccc version < 8.x and optimization, the build fails with; 'internal compiler error: in do_output_reload, at reload1.c:7978' This is due to gcc bug 90620: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90620. To avoid this, the haproxy package has a !BR2_microblaze dependency. However, this gcc bug 90620 only triggers when optimization is enabled, so we can work around the issue by passing -O0, which is what we do in other Buildroot packages to work around similar Microblaze issues. So, this commit passes -O0 when BR2_TOOLCHAIN_HAS_GCC_BUG_90620, and re-enables haproxy on Microblaze. Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2019-06-14 23:03:41 +02:00
HAPROXY_CFLAGS = $(TARGET_CFLAGS)
ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_90620),y)
HAPROXY_CFLAGS += -O0
endif
haproxy: new package HAProxy is a free, very fast and reliable solution offering high availability, load balancing, and proxying for TCP and HTTP-based applications. http://www.haproxy.org Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2018-09-21 22:56:19 +02:00
define HAPROXY_BUILD_CMDS
$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
package/haproxy: re-enable package on microblaze With Microblaze ccc version < 8.x and optimization, the build fails with; 'internal compiler error: in do_output_reload, at reload1.c:7978' This is due to gcc bug 90620: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90620. To avoid this, the haproxy package has a !BR2_microblaze dependency. However, this gcc bug 90620 only triggers when optimization is enabled, so we can work around the issue by passing -O0, which is what we do in other Buildroot packages to work around similar Microblaze issues. So, this commit passes -O0 when BR2_TOOLCHAIN_HAS_GCC_BUG_90620, and re-enables haproxy on Microblaze. Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2019-06-14 23:03:41 +02:00
$(HAPROXY_MAKE_OPTS) CFLAGS="$(HAPROXY_CFLAGS)" -C $(@D)
haproxy: new package HAProxy is a free, very fast and reliable solution offering high availability, load balancing, and proxying for TCP and HTTP-based applications. http://www.haproxy.org Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2018-09-21 22:56:19 +02:00
endef
define HAPROXY_INSTALL_TARGET_CMDS
$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
$(HAPROXY_MAKE_OPTS) -C $(@D) DESTDIR=$(TARGET_DIR) install
endef
$(eval $(generic-package))
Reference in New Issue Copy Permalink