Skip to content

Commit 6730fb1

Browse files
joerg-krausetpetazzoni
authored andcommitted
package/libffi: bump to version 3.2.1
Also: - unfuzz patches #1 and #2 - remove applied patches upstream Signed-off-by: Jörg Krause <[email protected]> Signed-off-by: Thomas Petazzoni <[email protected]>
1 parent 64476e4 commit 6730fb1

7 files changed

Lines changed: 34 additions & 134 deletions

package/libffi/0001-Fix-installation-location-of-libffi.patch

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
From 102c02de867bfe831b5366c89d66bcf170db962e Mon Sep 17 00:00:00 2001
1+
From 580f46a7bc6e9fea3a2227b5268cc3aed1d60e3b Mon Sep 17 00:00:00 2001
22
From: Thomas Petazzoni <[email protected]>
33
Date: Thu, 7 Feb 2013 22:26:56 +0100
44
Subject: [PATCH] Fix installation location of libffi
5+
MIME-Version: 1.0
6+
Content-Type: text/plain; charset=UTF-8
7+
Content-Transfer-Encoding: 8bit
58

69
The libffi is currently declared as toolexeclib_LTLIBRARIES. In many
710
cases, toolexeclib libraries will be installed in /usr/lib, so it
@@ -28,15 +31,17 @@ the more standard lib_LTLIBRARIES, which ensures that the libffi
2831
library is always installed in /usr/lib.
2932

3033
Signed-off-by: Thomas Petazzoni <[email protected]>
34+
[unfuzz for 3.2.1]
35+
Signed-off-by: Jörg Krause <[email protected]>
3136
---
32-
Makefile.am | 2 +-
37+
Makefile.am | 2 +-
3338
1 file changed, 1 insertion(+), 1 deletion(-)
3439

3540
diff --git a/Makefile.am b/Makefile.am
36-
index 6f669ca..b60bcc1 100644
41+
index 0e40451..309474c 100644
3742
--- a/Makefile.am
3843
+++ b/Makefile.am
39-
@@ -93,7 +93,7 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS)
44+
@@ -104,7 +104,7 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS)
4045

4146
MAKEOVERRIDES=
4247

@@ -46,5 +51,5 @@ index 6f669ca..b60bcc1 100644
4651

4752
libffi_la_SOURCES = src/prep_cif.c src/types.c \
4853
--
49-
1.7.9.5
54+
2.5.3
5055

package/libffi/0002-Fix-use-of-compact-eh-frames-on-MIPS.patch

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,29 @@
1+
From 31b6b6bc14197cd4183bdbd311fddeb36b5ae100 Mon Sep 17 00:00:00 2001
2+
From: =?UTF-8?q?J=C3=B6rg=20Krause?= <[email protected]>
3+
Date: Sat, 19 Sep 2015 22:53:29 +0200
4+
Subject: [PATCH] Fix use of compact eh frames on MIPS
5+
MIME-Version: 1.0
6+
Content-Type: text/plain; charset=UTF-8
7+
Content-Transfer-Encoding: 8bit
8+
19
Newer MIPS toolchains use a different (compact) eh_frame format.
210
libffi don't like them, so we have to switch to the older format.
311

412
This patch add -mno-compact-eh to CFLAGS when compiling for
513
Mips and compiler support it.
614

715
Signed-off-by: Jérôme Pouiller <[email protected]>
16+
[unfuzz for 3.2.1]
17+
Signed-off-by: Jörg Krause <[email protected]>
18+
---
19+
configure.ac | 10 ++++++++++
20+
1 file changed, 10 insertions(+)
821

9-
--- a/configure.ac 2013-08-08 14:53:11.884267155 +0200
10-
+++ b/configure.ac 2013-08-08 14:54:14.437493244 +0200
11-
@@ -430,6 +430,16 @@
22+
diff --git a/configure.ac b/configure.ac
23+
index a7bf5ee..36cd0d4 100644
24+
--- a/configure.ac
25+
+++ b/configure.ac
26+
@@ -469,6 +469,16 @@ esac
1227
AM_CONDITIONAL(FFI_EXEC_TRAMPOLINE_TABLE, test x$FFI_EXEC_TRAMPOLINE_TABLE = x1)
1328
AC_SUBST(FFI_EXEC_TRAMPOLINE_TABLE)
1429

@@ -23,5 +38,8 @@ Signed-off-by: Jérôme Pouiller <[email protected]>
2338
+fi
2439
+
2540
if test x$TARGET = xX86_64; then
26-
AC_CACHE_CHECK([assembler supports unwind section type],
41+
AC_CACHE_CHECK([toolchain supports unwind section type],
2742
libffi_cv_as_x86_64_unwind_section_type, [
43+
--
44+
2.5.3
45+

package/libffi/0003-fix-typo.patch

Lines changed: 0 additions & 41 deletions
This file was deleted.

package/libffi/0004-Add-missing-GNU-stack-markings-in-win32.S.patch

Lines changed: 0 additions & 36 deletions
This file was deleted.

package/libffi/0005-Fix-paths-in-libffi.pc.in.patch

Lines changed: 0 additions & 46 deletions
This file was deleted.

package/libffi/libffi.hash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# From ftp://sourceware.org/pub/libffi/sha512.sum
2-
sha512 8994973d75facf5ad928c270e17b1a56e24d1543af75b93731a0048e747df27e4190a736b6dc2dca7d43de1d7e88891220304802c10fcccdcebee9c9ffd3d1b9 libffi-3.1.tar.gz
2+
sha512 980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483 libffi-3.2.1.tar.gz

package/libffi/libffi.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
################################################################################
66

7-
LIBFFI_VERSION = 3.1
7+
LIBFFI_VERSION = 3.2.1
88
LIBFFI_SITE = ftp://sourceware.org/pub/libffi
99
LIBFFI_LICENSE = MIT
1010
LIBFFI_LICENSE_FILES = LICENSE

0 commit comments

Comments
 (0)