Thanks, applied as 1dc8c83fdbfb459cab5124f138d22ff6173c0919. Michael
[sent from post-receive hook] On Fri, 11 Nov 2022 15:31:17 +0100, Christian Melki <[email protected]> wrote: > Some fixes, mostly aarch64. > https://github.com/libffi/libffi/releases/tag/v3.4.4 > > * Forward patches and regenerate them so they apply without whine. > > Signed-off-by: Christian Melki <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git > a/patches/libffi-3.4.3/0001-libffi-Fix-location-of-libraries-for-multilib-toolch.patch > > b/patches/libffi-3.4.4/0001-libffi-Fix-location-of-libraries-for-multilib-toolch.patch > similarity index 100% > rename from > patches/libffi-3.4.3/0001-libffi-Fix-location-of-libraries-for-multilib-toolch.patch > rename to > patches/libffi-3.4.4/0001-libffi-Fix-location-of-libraries-for-multilib-toolch.patch > diff --git > a/patches/libffi-3.4.3/0002-libffi-ensure-sysroot-paths-are-not-in-libffi.pc.patch > > b/patches/libffi-3.4.4/0002-libffi-ensure-sysroot-paths-are-not-in-libffi.pc.patch > similarity index 92% > rename from > patches/libffi-3.4.3/0002-libffi-ensure-sysroot-paths-are-not-in-libffi.pc.patch > rename to > patches/libffi-3.4.4/0002-libffi-ensure-sysroot-paths-are-not-in-libffi.pc.patch > index 686b9ad6b746..7606955f37a5 100644 > --- > a/patches/libffi-3.4.3/0002-libffi-ensure-sysroot-paths-are-not-in-libffi.pc.patch > +++ > b/patches/libffi-3.4.4/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 ed394c9f9145..a3006b342c58 100644 > +index 7e8cd98a4ce8..cf37e88bf5f6 100644 > --- a/configure.ac > +++ b/configure.ac > -@@ -418,7 +418,7 @@ AC_ARG_ENABLE(multi-os-directory, > +@@ -405,7 +405,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.4.3/autogen.sh b/patches/libffi-3.4.4/autogen.sh > similarity index 100% > rename from patches/libffi-3.4.3/autogen.sh > rename to patches/libffi-3.4.4/autogen.sh > diff --git a/patches/libffi-3.4.3/series b/patches/libffi-3.4.4/series > similarity index 100% > rename from patches/libffi-3.4.3/series > rename to patches/libffi-3.4.4/series > diff --git a/rules/libffi.make b/rules/libffi.make > index fe8ea11b6344..af8d6226131e 100644 > --- a/rules/libffi.make > +++ b/rules/libffi.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBFFI) += libffi > # > # Paths and names > # > -LIBFFI_VERSION := 3.4.3 > -LIBFFI_MD5 := b57b0ac1d1072681cee9148a417bd2ec > +LIBFFI_VERSION := 3.4.4 > +LIBFFI_MD5 := 0da1a5ed7786ac12dcbaf0d499d8a049 > LIBFFI := libffi-$(LIBFFI_VERSION) > LIBFFI_SUFFIX := tar.gz > LIBFFI_SOURCE := $(SRCDIR)/$(LIBFFI).$(LIBFFI_SUFFIX)
