Re: [Buildroot] [PATCH 1/1] support/libtool: make v2.6 patch apply to libtool 2.6.0 ltmain.sh

[Baruch Siach via buildroot <buildroot@buildroot.org>]

Hi Martin,

On Mon, Oct 19 2026, Martin Contamin via buildroot wrote:
> Commit 5dbba2616f ("package/pkg-autotools.mk: also handle libtool 2.6.x")
> enabled the libtool 2.6 patch for packages shipping an ltmain.sh
> generated with libtool 2.6.0, such as libmodbus 3.1.12. But this patch
> was written against libtool 2.6.2, where the -static-libtool-libs
> pattern was merged with --static and -Bstatic. In libtool 2.6.0 the
> corresponding context line only reads "-static-libtool-libs)", so
> hunk #4 failed to apply and the build stopped at the "Patching libtool"
> step.
>
> Remove the context lines around this deletion so the hunk only relies
> on the deleted lines themselves, which are identical in both versions;
> the patch now applies to ltmain.sh from both libtool 2.6.0 and 2.6.2.
>
> Fixes: https://autobuild.buildroot.org/results/11f3c460407c816d9829f101f0ee55e4b03965cd/
>
> Signed-off-by: Martin Contamin <martin.contamin@murena.io>

You might want to take a look at the patch Thomas suggested:

https://patchwork.buildroot.org/project/buildroot/patch/20261011074658.1888569-1-thomas.petazzoni@bootlin.com/

baruch

> ---
>  support/libtool/buildroot-libtool-v2.6.patch | 8 +-------
>  1 file changed, 1 insertion(+), 7 deletions(-)
>
> diff --git a/support/libtool/buildroot-libtool-v2.6.patch b/support/libtool/buildroot-libtool-v2.6.patch
> index b3968b1289..060acaad5d 100644
> --- a/support/libtool/buildroot-libtool-v2.6.patch
> +++ b/support/libtool/buildroot-libtool-v2.6.patch
> @@ -42,19 +42,13 @@ Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
>   	  if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then
>   	    func_warning "complete static linking is impossible in this configuration"
>   	  fi
> -@@ -7072,12 +7076,6 @@
> - 	  fi
> - 	  prefer_static_libs=yes
> - 	  ;;
> +@@ -7072,6 +7076,0 @@
>  -	-static)
>  -	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
>  -	    dlopen_self=$dlopen_self_static
>  -	  fi
>  -	  prefer_static_libs=built
>  -	  ;;
> - 	-static-libtool-libs | --static | -Bstatic)
> - 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
> - 	    dlopen_self=$dlopen_self_static
>  @@ -7393,7 +7391,8 @@
>         prevarg=$arg

-- 
                                                     ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch@tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot