Thanks, applied as eabfca96295629ba6b41d4e0d0d7ddac75c6477e. Michael
[sent from post-receive hook] On Thu, 25 Jun 2026 21:23:43 +0200, Christian Melki <[email protected]> wrote: > Some updates and fixes. > https://github.com/libffi/libffi/releases/tag/v3.6.0 > > * Adjust patchset, slight offset. Applies cleanly. > > Signed-off-by: Christian Melki <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git > a/patches/libffi-3.5.2/0001-libffi-Fix-location-of-libraries-for-multilib-toolch.patch > > b/patches/libffi-3.6.0/0001-libffi-Fix-location-of-libraries-for-multilib-toolch.patch > similarity index 94% > rename from > patches/libffi-3.5.2/0001-libffi-Fix-location-of-libraries-for-multilib-toolch.patch > rename to > patches/libffi-3.6.0/0001-libffi-Fix-location-of-libraries-for-multilib-toolch.patch > index 99a4a29da515..3732a26389dd 100644 > --- > a/patches/libffi-3.5.2/0001-libffi-Fix-location-of-libraries-for-multilib-toolch.patch > +++ > b/patches/libffi-3.6.0/0001-libffi-Fix-location-of-libraries-for-multilib-toolch.patch > @@ -10,7 +10,7 @@ Signed-off-by: Christian Melki <[email protected]> > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Makefile.am b/Makefile.am > -index c3bcf00b3279..10ffb9077c6f 100644 > +index 74f87259b179..2581d5fa6c20 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -39,7 +39,7 @@ MAKEOVERRIDES= > diff --git > a/patches/libffi-3.5.2/0002-libffi-ensure-sysroot-paths-are-not-in-libffi.pc.patch > > b/patches/libffi-3.6.0/0002-libffi-ensure-sysroot-paths-are-not-in-libffi.pc.patch > similarity index 92% > rename from > patches/libffi-3.5.2/0002-libffi-ensure-sysroot-paths-are-not-in-libffi.pc.patch > rename to > patches/libffi-3.6.0/0002-libffi-ensure-sysroot-paths-are-not-in-libffi.pc.patch > index 2e343303e2f8..3f173d32ed00 100644 > --- > a/patches/libffi-3.5.2/0002-libffi-ensure-sysroot-paths-are-not-in-libffi.pc.patch > +++ > b/patches/libffi-3.6.0/0002-libffi-ensure-sysroot-paths-are-not-in-libffi.pc.patch > @@ -19,10 +19,10 @@ Signed-off-by: Ross Burton <[email protected]> > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/configure.ac b/configure.ac > -index dcfc7b242d02..d4a8a66c80b7 100644 > +index 2c8ba77970b3..4e9251578eaf 100644 > --- a/configure.ac > +++ b/configure.ac > -@@ -411,7 +411,7 @@ AC_ARG_ENABLE(multi-os-directory, > +@@ -423,7 +423,7 @@ AC_ARG_ENABLE(multi-os-directory, > > # These variables are only ever used when we cross-build to X86_WIN32. > # And we only support this with GCC, so... > diff --git a/patches/libffi-3.5.2/autogen.sh b/patches/libffi-3.6.0/autogen.sh > similarity index 100% > rename from patches/libffi-3.5.2/autogen.sh > rename to patches/libffi-3.6.0/autogen.sh > diff --git a/patches/libffi-3.5.2/series b/patches/libffi-3.6.0/series > similarity index 100% > rename from patches/libffi-3.5.2/series > rename to patches/libffi-3.6.0/series > diff --git a/rules/libffi.make b/rules/libffi.make > index aaa626b57661..3b5d3274ec46 100644 > --- a/rules/libffi.make > +++ b/rules/libffi.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBFFI) += libffi > # > # Paths and names > # > -LIBFFI_VERSION := 3.5.2 > -LIBFFI_SHA256 := > f3a3082a23b37c293a4fcd1053147b371f2ff91fa7ea1b2a52e335676bac82dc > +LIBFFI_VERSION := 3.6.0 > +LIBFFI_SHA256 := > 31ff1fe32deaebfbb388727f32677bb254bf2a41382c51464c0b1837c9ee9828 > LIBFFI := libffi-$(LIBFFI_VERSION) > LIBFFI_SUFFIX := tar.gz > LIBFFI_SOURCE := $(SRCDIR)/$(LIBFFI).$(LIBFFI_SUFFIX)
