| Message ID | 20191101111005.21389-1-fontaine.fabrice@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] package/haproxy: fix build on m68k | expand |
On Fri, 1 Nov 2019 12:10:05 +0100 Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote: > 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> > --- > package/haproxy/haproxy.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes: > On Fri, 1 Nov 2019 12:10:05 +0100 > Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote: >> 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> >> --- >> package/haproxy/haproxy.mk | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) Committed to 2020.02.x, thanks.
diff --git a/package/haproxy/haproxy.mk b/package/haproxy/haproxy.mk index 9d0ef5710f..fdaf5ed19b 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)
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> --- package/haproxy/haproxy.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)