Thanks, applied as fffa2d6a6bccd08e3c975c13c70adebaf360dfd5.

Michael

[sent from post-receive hook]

On Fri, 09 May 2025 09:25:06 +0200, Christian Melki 
<[email protected]> wrote:
> Minor changes.
> https://github.com/libffi/libffi/releases/tag/v3.4.8
> 
> * Adjust patch offsets. 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.4.7/0001-libffi-Fix-location-of-libraries-for-multilib-toolch.patch
>  
> b/patches/libffi-3.4.8/0001-libffi-Fix-location-of-libraries-for-multilib-toolch.patch
> similarity index 94%
> rename from 
> patches/libffi-3.4.7/0001-libffi-Fix-location-of-libraries-for-multilib-toolch.patch
> rename to 
> patches/libffi-3.4.8/0001-libffi-Fix-location-of-libraries-for-multilib-toolch.patch
> index 851455713d9f..9e6fcafdf8e0 100644
> --- 
> a/patches/libffi-3.4.7/0001-libffi-Fix-location-of-libraries-for-multilib-toolch.patch
> +++ 
> b/patches/libffi-3.4.8/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 3de0bea4737d..55b507e021aa 100644
> +index ba3d16626077..3f60163c75c9 100644
>  --- a/Makefile.am
>  +++ b/Makefile.am
>  @@ -35,7 +35,7 @@ MAKEOVERRIDES=
> diff --git 
> a/patches/libffi-3.4.7/0002-libffi-ensure-sysroot-paths-are-not-in-libffi.pc.patch
>  
> b/patches/libffi-3.4.8/0002-libffi-ensure-sysroot-paths-are-not-in-libffi.pc.patch
> similarity index 92%
> rename from 
> patches/libffi-3.4.7/0002-libffi-ensure-sysroot-paths-are-not-in-libffi.pc.patch
> rename to 
> patches/libffi-3.4.8/0002-libffi-ensure-sysroot-paths-are-not-in-libffi.pc.patch
> index fc77ca27b1e6..441b2cd48a89 100644
> --- 
> a/patches/libffi-3.4.7/0002-libffi-ensure-sysroot-paths-are-not-in-libffi.pc.patch
> +++ 
> b/patches/libffi-3.4.8/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 741a6690a729..2aa767cb192e 100644
> +index f04789556ba4..630bdd555154 100644
>  --- a/configure.ac
>  +++ b/configure.ac
> -@@ -401,7 +401,7 @@ AC_ARG_ENABLE(multi-os-directory,
> +@@ -402,7 +402,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.7/autogen.sh b/patches/libffi-3.4.8/autogen.sh
> similarity index 100%
> rename from patches/libffi-3.4.7/autogen.sh
> rename to patches/libffi-3.4.8/autogen.sh
> diff --git a/patches/libffi-3.4.7/series b/patches/libffi-3.4.8/series
> similarity index 100%
> rename from patches/libffi-3.4.7/series
> rename to patches/libffi-3.4.8/series
> diff --git a/rules/libffi.make b/rules/libffi.make
> index f983b1beaabe..923cb531db91 100644
> --- a/rules/libffi.make
> +++ b/rules/libffi.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBFFI) += libffi
>  #
>  # Paths and names
>  #
> -LIBFFI_VERSION               := 3.4.7
> -LIBFFI_MD5           := 696a1d483a1174ce8a477575546a5284
> +LIBFFI_VERSION               := 3.4.8
> +LIBFFI_MD5           := ba5fc49d57d13b9e6cecd0c78d76688b
>  LIBFFI                       := libffi-$(LIBFFI_VERSION)
>  LIBFFI_SUFFIX                := tar.gz
>  LIBFFI_SOURCE                := $(SRCDIR)/$(LIBFFI).$(LIBFFI_SUFFIX)

Reply via email to