Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
To: Bernd Kuhls <bernd@kuhls.net>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>, buildroot@buildroot.org
Subject: Re: [Buildroot] [PATCH 1/1] package/libffi: bump version to 3.4.6
Date: Thu, 28 Mar 2024 20:35:18 +0100	[thread overview]
Message-ID: <ZgXGdpC4WwxKR42m@landeda> (raw)
In-Reply-To: <20240221195520.1762497-1-bernd@kuhls.net>

Bernd, All,

On 2024-02-21 20:55 +0100, Bernd Kuhls spake thusly:
> Removed patch 0001 and instead added new configure option
> --disable-multi-os-directory which was added upstream:
> https://github.com/libffi/libffi/commit/877ea9bf9ac2c98cb858c12f5a6aeeec13cf978f
> 
> Removed patch 0003 due to various upstream fixes for mips soft-float
> support since its addition in 2016:
> https://github.com/libffi/libffi/commits/master/src/mips
> 
> Renumbered remaining patch.
> 
> Updated license hash due to copyright year bump:
> https://github.com/libffi/libffi/commit/91739a1a912476adbf1e0e4dcb091b9a2c5007d9
> 
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
[--SNIP--]
> diff --git a/package/libffi/0002-Fix-use-of-compact-eh-frames-on-MIPS.patch b/package/libffi/0001-Fix-use-of-compact-eh-frames-on-MIPS.patch
> similarity index 94%
> rename from package/libffi/0002-Fix-use-of-compact-eh-frames-on-MIPS.patch
> rename to package/libffi/0001-Fix-use-of-compact-eh-frames-on-MIPS.patch
> index c19e395f90..7786b984a2 100644
> --- a/package/libffi/0002-Fix-use-of-compact-eh-frames-on-MIPS.patch
> +++ b/package/libffi/0001-Fix-use-of-compact-eh-frames-on-MIPS.patch
> @@ -15,6 +15,8 @@ Mips and compiler support it.
>  Signed-off-by: Jérôme Pouiller <jezz@sysmic.org>
>  [unfuzz for 3.2.1]
>  Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
> +[rebased for 3.4.6]
> +Signed-off-by: Bernd Kuhls <bernd@kuhls.net>

    $ ./utils/docker-run make check-package
    package/libffi/0001-Fix-use-of-compact-eh-frames-on-MIPS.patch:0: missing Upstream in the header (https://nightly.buildroot.org/#_additional_patch_documentation)
    .checkpackageignore:597: ignored file package/libffi/0001-Fix-installation-location-of-libffi.patch is missing
    .checkpackageignore:598: ignored file package/libffi/0002-Fix-use-of-compact-eh-frames-on-MIPS.patch is missing
    .checkpackageignore:599: ignored file package/libffi/0003-libffi-enable-hardfloat-in-the-MIPS-assembly-code.patch is missing

The first two are due to the renaming, so I fixed .checkpackage to refer
to the new filename for that patch. The others two, I removed.

Applied to master, thanks.

Regards,
Yann E. MORIN.

>  ---
>   configure.ac | 10 ++++++++++
>   1 file changed, 10 insertions(+)
> @@ -23,7 +25,7 @@ diff --git a/configure.ac b/configure.ac
>  index a7bf5ee..36cd0d4 100644
>  --- a/configure.ac
>  +++ b/configure.ac
> -@@ -469,6 +469,16 @@ esac
> +@@ -238,6 +238,16 @@ esac
>   AM_CONDITIONAL(FFI_EXEC_TRAMPOLINE_TABLE, test x$FFI_EXEC_TRAMPOLINE_TABLE = x1)
>   AC_SUBST(FFI_EXEC_TRAMPOLINE_TABLE)
>   
> diff --git a/package/libffi/0003-libffi-enable-hardfloat-in-the-MIPS-assembly-code.patch b/package/libffi/0003-libffi-enable-hardfloat-in-the-MIPS-assembly-code.patch
> deleted file mode 100644
> index 168972a871..0000000000
> --- a/package/libffi/0003-libffi-enable-hardfloat-in-the-MIPS-assembly-code.patch
> +++ /dev/null
> @@ -1,44 +0,0 @@
> -From 48bc37fabbc685b1e3293055bd33ca66c619305e Mon Sep 17 00:00:00 2001
> -From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> -Date: Wed, 13 Jan 2016 14:49:59 +0000
> -Subject: [PATCH] libffi: enable hardfloat in the MIPS assembly code
> -
> -This way it will be possible to build it for soft-float. This is only a
> -temporary fix. The package needs to be fixed properly.
> -
> -Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> -[Update for 3.3-rc0]
> -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ----
> - src/mips/n32.S | 1 +
> - src/mips/o32.S | 1 +
> - 2 files changed, 2 insertions(+)
> -
> -diff --git a/src/mips/n32.S b/src/mips/n32.S
> -index c6985d3..dc842d5 100644
> ---- a/src/mips/n32.S
> -+++ b/src/mips/n32.S
> -@@ -44,6 +44,7 @@
> - #endif
> - #if !defined(__mips_isa_rev) || (__mips_isa_rev<6)
> - 	.set mips4
> - #endif
> -+	.set hardfloat
> - 	.text
> - 	.align	2
> - 	.globl	ffi_call_N32
> -diff --git a/src/mips/o32.S b/src/mips/o32.S
> -index eb27981..b653daf 100644
> ---- a/src/mips/o32.S
> -+++ b/src/mips/o32.S
> -@@ -42,6 +42,7 @@
> - #define RA_OFF		(SIZEOF_FRAME - 1 * FFI_SIZEOF_ARG)
> - 
> - 	.abicalls
> -+	.set hardfloat
> - 	.text
> - 	.align	2
> - 	.globl	ffi_call_O32
> --- 
> -2.4.10
> -
> diff --git a/package/libffi/libffi.hash b/package/libffi/libffi.hash
> index 8d2349ec21..c2ef588f6b 100644
> --- a/package/libffi/libffi.hash
> +++ b/package/libffi/libffi.hash
> @@ -1,4 +1,4 @@
>  # Locally calculated
> -sha256  d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676  libffi-3.4.4.tar.gz
> +sha256  b0dea9df23c863a7a50e825440f3ebffabd65df1497108e5d437747843895a4e  libffi-3.4.6.tar.gz
>  # License files, locally calculated
> -sha256  2c9c2acb9743e6b007b91350475308aee44691d96aa20eacef8e199988c8c388  LICENSE
> +sha256  67894089811f93fca47a76f85e017da6f8582d4ba0905963c6e0f1ad6df7a195  LICENSE
> diff --git a/package/libffi/libffi.mk b/package/libffi/libffi.mk
> index 6249023eae..9c47cf3973 100644
> --- a/package/libffi/libffi.mk
> +++ b/package/libffi/libffi.mk
> @@ -4,19 +4,20 @@
>  #
>  ################################################################################
>  
> -LIBFFI_VERSION = 3.4.4
> +LIBFFI_VERSION = 3.4.6
>  LIBFFI_SITE = \
>  	https://github.com/libffi/libffi/releases/download/v$(LIBFFI_VERSION)
>  LIBFFI_LICENSE = MIT
>  LIBFFI_LICENSE_FILES = LICENSE
>  LIBFFI_CPE_ID_VALID = YES
>  LIBFFI_INSTALL_STAGING = YES
> -# We're patching Makefile.am
> +# We're patching configure.ac
>  LIBFFI_AUTORECONF = YES
> +LIBFFI_CONF_OPTS = --disable-multi-os-directory
>  
>  # The static exec trampolines is enabled by default since
>  # libffi 3.4.2. However it doesn't work with gobject-introspection.
> -LIBFFI_CONF_OPTS = --disable-exec-static-tramp
> +LIBFFI_CONF_OPTS += --disable-exec-static-tramp
>  
>  $(eval $(autotools-package))
>  $(eval $(host-autotools-package))
> -- 
> 2.39.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

      parent reply	other threads:[~2024-03-28 19:35 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-21 19:55 [Buildroot] [PATCH 1/1] package/libffi: bump version to 3.4.6 Bernd Kuhls
2024-03-23 20:37 ` Adam Duskett
2024-04-28 11:19   ` Peter Korsgaard
2024-03-28 19:35 ` Yann E. MORIN [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=ZgXGdpC4WwxKR42m@landeda \
    --to=yann.morin.1998@free.fr \
    --cc=bernd@kuhls.net \
    --cc=buildroot@buildroot.org \
    --cc=thomas.petazzoni@bootlin.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox