From: Fabrice Fontaine Date: Fri, 1 Nov 2019 11:10:05 +0000 (+0100) Subject: package/haproxy: fix build on m68k X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fb7fd98774b94d7c50f381ae4e2d005db21afb3e;p=buildroot.git 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 Signed-off-by: Thomas Petazzoni --- diff --git a/package/haproxy/haproxy.mk b/package/haproxy/haproxy.mk index 6752367fac..e59896b485 100644 --- a/package/haproxy/haproxy.mk +++ b/package/haproxy/haproxy.mk @@ -19,7 +19,7 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) HAPROXY_LIBS += -latomic endif -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS_NPTL),y) # 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)