package/haproxy: fix build on m68k
PATCH 1/1 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
--- package/haproxy/haproxy.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/haproxy/haproxy.mk +1 -1
@@ -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)
Signature · 1 line
2.23.0
Thomas Petazzoni
AppliedPATCH 1/1 package/haproxy: fix build on m68k
Quoted 11 lines · On Fri, 1 Nov 2019 12:10:05 +0100 Fabrice Fontaine…
When threads are enabled, haproxy expects that
pthread_getcpuclockidis 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/52cc4b1fcac2a4fc84ab15ec4c692d2cd9b6d8bdSigned-off-by Fabrice Fontaine <[email protected]>--- package/haproxy/haproxy.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 package/haproxy: fix build on m68k
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Quoted 4 lines · On Fri, 1 Nov 2019 12:10:05 +0100 Fabrice Fontaine…
When threads are enabled, haproxy expects that
pthread_getcpuclockidis available which is not the case on m68k. Fix this by enabling threads support only if NPTL is available.
Quoted 7 lines
Quoted 7 lines
Fixes:
- http://autobuild.buildroot.org/results/52cc4b1fcac2a4fc84ab15ec4c692d2cd9b6d8bdSigned-off-by Fabrice Fontaine <[email protected]>---
package/haproxy/haproxy.mk| 2 +-1 file changed, 1 insertion(+), 1 deletion(-)
Committed to 2020.02.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard