* [Buildroot] [PATCH 1/1] package/haproxy: fix build on m68k
@ 2019-11-01 11:10 Fabrice Fontaine
2020-04-19 20:50 ` Thomas Petazzoni
0 siblings, 1 reply; 3+ messages in thread
From: Fabrice Fontaine @ 2019-11-01 11:10 UTC (permalink / raw)
To: buildroot
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(-)
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)
--
2.23.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/1] package/haproxy: fix build on m68k
2019-11-01 11:10 [Buildroot] [PATCH 1/1] package/haproxy: fix build on m68k Fabrice Fontaine
@ 2020-04-19 20:50 ` Thomas Petazzoni
2020-05-06 5:52 ` Peter Korsgaard
0 siblings, 1 reply; 3+ messages in thread
From: Thomas Petazzoni @ 2020-04-19 20:50 UTC (permalink / raw)
To: buildroot
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 Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/1] package/haproxy: fix build on m68k
2020-04-19 20:50 ` Thomas Petazzoni
@ 2020-05-06 5:52 ` Peter Korsgaard
0 siblings, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2020-05-06 5:52 UTC (permalink / raw)
To: buildroot
>>>>> "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.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-05-06 5:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-01 11:10 [Buildroot] [PATCH 1/1] package/haproxy: fix build on m68k Fabrice Fontaine
2020-04-19 20:50 ` Thomas Petazzoni
2020-05-06 5:52 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox