[1/1] haproxy: put back dependency on __sync_*_4

Message ID 20181005194527.12140-1-fontaine.fabrice@gmail.com
State Accepted
Headers show
Series
  • [1/1] haproxy: put back dependency on __sync_*_4
Related show

Commit Message

Fabrice Fontaine Oct. 5, 2018, 7:45 p.m.
__sync_*_4 intrinsics is used by common/hathreads.h when gcc < 4.7 but
also by contrib/tcploop.c or include/proto/shctx.h so put back a
mandatory dependency on BR2_TOOLCHAIN_HAS_SYNC_4 which has been wrongly
removed by patch 978001

Fixes:
 - http://autobuild.buildroot.net/results/52c88f2f27e1a3c42cf71554cf680da86d933ef6

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/haproxy/Config.in | 1 +
 1 file changed, 1 insertion(+)

Comments

Thomas Petazzoni Oct. 14, 2018, 8:05 a.m. | #1
Hello,

On Fri,  5 Oct 2018 21:45:27 +0200, Fabrice Fontaine wrote:
> __sync_*_4 intrinsics is used by common/hathreads.h when gcc < 4.7 but
> also by contrib/tcploop.c or include/proto/shctx.h so put back a
> mandatory dependency on BR2_TOOLCHAIN_HAS_SYNC_4 which has been wrongly
> removed by patch 978001

When referencing commits, please use the Git commit hash and its commit
title and not the patchwork ID. I.e, like this:

    __sync_*_4 intrinsics is used by common/hathreads.h when gcc < 4.7 but
    also by contrib/tcploop.c or include/proto/shctx.h so put back a
    mandatory dependency on BR2_TOOLCHAIN_HAS_SYNC_4 which has been
    wrongly removed by commit f22fca4bf27f884950dd7804020e5d5193b570b9
    ("haproxy: tweak thread activation").

I've applied after fixing this. Thanks!

Thomas

Patch

diff --git a/package/haproxy/Config.in b/package/haproxy/Config.in
index fbe5941b55..cbcbc0c388 100644
--- a/package/haproxy/Config.in
+++ b/package/haproxy/Config.in
@@ -1,6 +1,7 @@ 
 config BR2_PACKAGE_HAPROXY
 	bool "haproxy"
 	depends on BR2_USE_MMU # fork()
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # __sync_*_4 intrisics
 	help
 	  HAProxy is a free, very fast and reliable solution offering
 	  high availability, load balancing, and proxying for TCP and