Skip to content

Commit

Permalink
package/libffi: bump version to 3.4.6
Browse files Browse the repository at this point in the history
Removed patch 0001 and instead added new configure option
--disable-multi-os-directory which was added upstream:
libffi/libffi@877ea9b

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:
libffi/libffi@91739a1

Signed-off-by: Bernd Kuhls <[email protected]>
Reviewed-by: Adam Duskett <[email protected]>
Tested-by: Adam Duskett <[email protected]>
[[email protected]: fix check-package]
Signed-off-by: Yann E. MORIN <[email protected]>
  • Loading branch information
bkuhls authored and pcercuei committed Aug 13, 2024
1 parent c2eda85 commit 009f7e6
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 108 deletions.
4 changes: 1 addition & 3 deletions .checkpackageignore
Original file line number Diff line number Diff line change
Expand Up @@ -645,9 +645,7 @@ package/libedit/0001-check-bsd-functions-in-libbsd.patch Upstream
package/libevent/0001-Don-t-define-BIO_get_init-for-LibreSSL-3-5.patch Upstream
package/libfcgi/0001-link-against-math.patch Upstream
package/libfcgi/0002-disable-examples.patch Sob Upstream
package/libffi/0001-Fix-installation-location-of-libffi.patch Upstream
package/libffi/0002-Fix-use-of-compact-eh-frames-on-MIPS.patch Upstream
package/libffi/0003-libffi-enable-hardfloat-in-the-MIPS-assembly-code.patch Upstream
package/libffi/0001-Fix-use-of-compact-eh-frames-on-MIPS.patch Upstream
package/libfm/0001-modules-fix-cross-compilation.patch Upstream
package/libfreeimage/0001-no-root-install.patch Upstream
package/libfreeimage/0002-fix-cpuid-x86.patch Upstream
Expand Down
55 changes: 0 additions & 55 deletions package/libffi/0001-Fix-installation-location-of-libffi.patch

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ Mips and compiler support it.
Signed-off-by: Jérôme Pouiller <[email protected]>
[unfuzz for 3.2.1]
Signed-off-by: Jörg Krause <[email protected]>
[rebased for 3.4.6]
Signed-off-by: Bernd Kuhls <[email protected]>
---
configure.ac | 10 ++++++++++
1 file changed, 10 insertions(+)
Expand All @@ -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)

Expand Down

This file was deleted.

4 changes: 2 additions & 2 deletions package/libffi/libffi.hash
Original file line number Diff line number Diff line change
@@ -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
7 changes: 4 additions & 3 deletions package/libffi/libffi.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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_VENDOR = libffi_project
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))

0 comments on commit 009f7e6

Please sign in to comment.