* [Buildroot] [PATCH 1/2] package/haproxy: fix build on aarch64
@ 2023-06-12 17:29 Bernd Kuhls
2023-06-12 17:29 ` [Buildroot] [PATCH 2/2] package/haproxy: bump version to 2.6.14 Bernd Kuhls
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Bernd Kuhls @ 2023-06-12 17:29 UTC (permalink / raw)
To: buildroot; +Cc: Fabrice Fontaine
Fixes:
http://autobuild.buildroot.net/results/07c/07ccb8c45c709a4b6ed32aafa33cd04e74174b11/
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
...mic.h-may-need-compiler.h-on-ARMv8.2.patch | 36 +++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 package/haproxy/0001-BUILD-atomic-atomic.h-may-need-compiler.h-on-ARMv8.2.patch
diff --git a/package/haproxy/0001-BUILD-atomic-atomic.h-may-need-compiler.h-on-ARMv8.2.patch b/package/haproxy/0001-BUILD-atomic-atomic.h-may-need-compiler.h-on-ARMv8.2.patch
new file mode 100644
index 0000000000..b3b1f732ab
--- /dev/null
+++ b/package/haproxy/0001-BUILD-atomic-atomic.h-may-need-compiler.h-on-ARMv8.2.patch
@@ -0,0 +1,36 @@
+From 5ab3c61932af7619518169da744ba6346f060405 Mon Sep 17 00:00:00 2001
+From: Willy Tarreau <w@1wt.eu>
+Date: Thu, 8 Dec 2022 08:32:57 +0100
+Subject: [PATCH] BUILD: atomic: atomic.h may need compiler.h on ARMv8.2-a
+
+We get a build error in ncbuf.c when building for ARMv8.2-a because ncbuf
+has minimal includes and among them bug.h which includes atomic.h. Atomic.h
+may use "forceinline" without including compiler.h, hence the build error.
+It was verified that adding it doesn't inflate the total headers.
+
+Since all other C files include api.h which already covers this, there's
+no real need to bapkport this. The issue was already there in 2.3 though.
+
+Upstream: https://git.haproxy.org/?p=haproxy.git;a=commitdiff;h=5ab3c61932af7619518169da744ba6346f060405#patch1
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ include/haproxy/atomic.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/include/haproxy/atomic.h b/include/haproxy/atomic.h
+index f60be95..7e3c826 100644
+--- a/include/haproxy/atomic.h
++++ b/include/haproxy/atomic.h
+@@ -23,6 +23,8 @@
+ #ifndef _HAPROXY_ATOMIC_H
+ #define _HAPROXY_ATOMIC_H
+
++#include <haproxy/compiler.h>
++
+ /* A few notes for the macros and functions here:
+ * - this file is painful to edit, most operations exist in 3 variants,
+ * no-thread, threads with gcc<4.7, threads with gcc>=4.7. Be careful when
+--
+1.7.10.4
+
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 2/2] package/haproxy: bump version to 2.6.14
2023-06-12 17:29 [Buildroot] [PATCH 1/2] package/haproxy: fix build on aarch64 Bernd Kuhls
@ 2023-06-12 17:29 ` Bernd Kuhls
2023-07-16 17:43 ` Peter Korsgaard
2023-07-01 20:47 ` [Buildroot] [PATCH 1/2] package/haproxy: fix build on aarch64 Thomas Petazzoni via buildroot
2023-07-16 17:43 ` Peter Korsgaard
2 siblings, 1 reply; 5+ messages in thread
From: Bernd Kuhls @ 2023-06-12 17:29 UTC (permalink / raw)
To: buildroot; +Cc: Fabrice Fontaine
Changelog: http://www.haproxy.org/download/2.6/src/CHANGELOG
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/haproxy/haproxy.hash | 4 ++--
package/haproxy/haproxy.mk | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/haproxy/haproxy.hash b/package/haproxy/haproxy.hash
index f5540ee44a..20048da7ec 100644
--- a/package/haproxy/haproxy.hash
+++ b/package/haproxy/haproxy.hash
@@ -1,5 +1,5 @@
-# From: http://www.haproxy.org/download/2.6/src/haproxy-2.6.9.tar.gz.sha256
-sha256 f01a1c5f465dc1b5cd175d0b28b98beb4dfe82b5b5b63ddcc68d1df433641701 haproxy-2.6.9.tar.gz
+# From: http://www.haproxy.org/download/2.6/src/haproxy-2.6.14.tar.gz.sha256
+sha256 bd3dd9fa60391ca09e1225e1ac3163e45be83c3f54f2fd76a30af289cc6e4fd4 haproxy-2.6.14.tar.gz
# Locally computed:
sha256 0717ca51fceaa25ac9e5ccc62e0c727dcf27796057201fb5fded56a25ff6ca28 LICENSE
sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a doc/lgpl.txt
diff --git a/package/haproxy/haproxy.mk b/package/haproxy/haproxy.mk
index 012c1dfdb6..2b8920efa6 100644
--- a/package/haproxy/haproxy.mk
+++ b/package/haproxy/haproxy.mk
@@ -5,7 +5,7 @@
################################################################################
HAPROXY_VERSION_MAJOR = 2.6
-HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).9
+HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).14
HAPROXY_SITE = http://www.haproxy.org/download/$(HAPROXY_VERSION_MAJOR)/src
HAPROXY_LICENSE = GPL-2.0+ and LGPL-2.1+ with exceptions
HAPROXY_LICENSE_FILES = LICENSE doc/lgpl.txt doc/gpl.txt
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/haproxy: fix build on aarch64
2023-06-12 17:29 [Buildroot] [PATCH 1/2] package/haproxy: fix build on aarch64 Bernd Kuhls
2023-06-12 17:29 ` [Buildroot] [PATCH 2/2] package/haproxy: bump version to 2.6.14 Bernd Kuhls
@ 2023-07-01 20:47 ` Thomas Petazzoni via buildroot
2023-07-16 17:43 ` Peter Korsgaard
2 siblings, 0 replies; 5+ messages in thread
From: Thomas Petazzoni via buildroot @ 2023-07-01 20:47 UTC (permalink / raw)
To: Bernd Kuhls; +Cc: Fabrice Fontaine, buildroot
On Mon, 12 Jun 2023 19:29:25 +0200
Bernd Kuhls <bernd.kuhls@t-online.de> wrote:
> Fixes:
> http://autobuild.buildroot.net/results/07c/07ccb8c45c709a4b6ed32aafa33cd04e74174b11/
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> ...mic.h-may-need-compiler.h-on-ARMv8.2.patch | 36 +++++++++++++++++++
> 1 file changed, 36 insertions(+)
> create mode 100644 package/haproxy/0001-BUILD-atomic-atomic.h-may-need-compiler.h-on-ARMv8.2.patch
Both applied to master, thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/haproxy: fix build on aarch64
2023-06-12 17:29 [Buildroot] [PATCH 1/2] package/haproxy: fix build on aarch64 Bernd Kuhls
2023-06-12 17:29 ` [Buildroot] [PATCH 2/2] package/haproxy: bump version to 2.6.14 Bernd Kuhls
2023-07-01 20:47 ` [Buildroot] [PATCH 1/2] package/haproxy: fix build on aarch64 Thomas Petazzoni via buildroot
@ 2023-07-16 17:43 ` Peter Korsgaard
2 siblings, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2023-07-16 17:43 UTC (permalink / raw)
To: Bernd Kuhls; +Cc: Fabrice Fontaine, buildroot
>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes:
> Fixes:
> http://autobuild.buildroot.net/results/07c/07ccb8c45c709a4b6ed32aafa33cd04e74174b11/
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Committed to 2023.02.x and 2023.05.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH 2/2] package/haproxy: bump version to 2.6.14
2023-06-12 17:29 ` [Buildroot] [PATCH 2/2] package/haproxy: bump version to 2.6.14 Bernd Kuhls
@ 2023-07-16 17:43 ` Peter Korsgaard
0 siblings, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2023-07-16 17:43 UTC (permalink / raw)
To: Bernd Kuhls; +Cc: Fabrice Fontaine, buildroot
>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes:
> Changelog: http://www.haproxy.org/download/2.6/src/CHANGELOG
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Committed to 2023.02.x and 2023.05.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-07-16 17:44 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-12 17:29 [Buildroot] [PATCH 1/2] package/haproxy: fix build on aarch64 Bernd Kuhls
2023-06-12 17:29 ` [Buildroot] [PATCH 2/2] package/haproxy: bump version to 2.6.14 Bernd Kuhls
2023-07-16 17:43 ` Peter Korsgaard
2023-07-01 20:47 ` [Buildroot] [PATCH 1/2] package/haproxy: fix build on aarch64 Thomas Petazzoni via buildroot
2023-07-16 17:43 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).