Re: [Buildroot] [PATCH 1/1] package/haproxy: bump to version 3.2.1 (lts branch)

From: Julien Olivain via buildroot <buildroot@buildroot.org>
To: Fred Lefranc <fred.lefranc.evs@gmail.com>
Cc: buildroot@buildroot.org,
	Fred Lefranc <fred.lefranc+evs@gmail.com>,
	Fabrice Fontaine <fontaine.fabrice@gmail.com>
Subject: Re: [Buildroot] [PATCH 1/1] package/haproxy: bump to version 3.2.1 (lts branch)
Date: Sun, 13 Jul 2025 12:36:43 +0200	[thread overview]
Message-ID: <41add64e1392d3584206104ee4d09192@free.fr> (raw)
In-Reply-To: <CAGkXw1XQXKAxnjudTsiM4jcVcH0pYhzLD6bxg4H5VGDi1bt1tQ@mail.gmail.com>

Hi Fred,

Thanks for the patch!

It was not applying as is, due to word wrapping. Could you make sure
to send patches with git send-email to make sure they are correctly
formatted please?

When doing a bump like this, could you add a link to a change log,
or a release note in the commit log?

For example, adding:
"""
For the change log since v2.6.22, see:
https://www.haproxy.org/download/3.2/src/CHANGELOG
"""

On 23/06/2025 11:00, Fred Lefranc wrote:
> Signed-off-by: Fred Lefranc <fred.lefranc+evs@gmail.com>
> ---
>  ...mic.h-may-need-compiler.h-on-ARMv8.2.patch | 36 -------------------
>  package/haproxy/haproxy.hash                  |  4 +--
>  package/haproxy/haproxy.mk                    |  4 +--
>  3 files changed, 4 insertions(+), 40 deletions(-)
>  delete mode 100644
> package/haproxy/0001-BUILD-atomic-atomic.h-may-need-compiler.h-on-ARMv8.2.patch
> 
[...]
> diff --git a/package/haproxy/haproxy.mk b/package/haproxy/haproxy.mk
> index 77195d966b..06d0c7bd26 100644
> --- a/package/haproxy/haproxy.mk
> +++ b/package/haproxy/haproxy.mk
> @@ -4,8 +4,8 @@
>  #
>  
> ################################################################################
> 
> -HAPROXY_VERSION_MAJOR = 2.6
> -HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).22
> +HAPROXY_VERSION_MAJOR = 3.2
> +HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).1

This bump is introducing build failures for static builds.
See:
https://gitlab.com/jolivain/buildroot/-/pipelines/1923624453

haproxy introduced a malloc_trim() symbol in
https://git.haproxy.org/?p=haproxy-3.2.git;a=commitdiff;h=eaba76b02dd41e0a1a2e85a3e71f91dfc529916d

Then tries to override it with libdl calls:
https://git.haproxy.org/?p=haproxy-3.2.git;a=blob;f=src/tools.c;h=aee750b4180c22c1b360305bf9ecc38a157d2c1e;hb=f4d1a4e279bcb00f758dfbf037e3808512df113b#l5480

Even if there is logic avoiding those libdl calls, the final link
fails due to this multiple definition of malloc_trim symbol.

You can reproduce the issue with commands:

     cat >.config <<EOF
     BR2_aarch64=y
     BR2_STATIC_LIBS=y
     BR2_TOOLCHAIN_EXTERNAL=y
     BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y
     BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_UCLIBC_BLEEDING_EDGE=y
     BR2_PACKAGE_HAPROXY=y
     EOF
     make olddefconfig
     make haproxy

Could you have a look to either fix those static builds, or
adding a Kconfig logic to restrict only to dynamic builds?

>  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.25.1

Can you send an updated patch addressing those comment, please?

Best regards,

Julien.
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot