diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2013-06-16 09:36:09 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2013-06-16 12:04:40 +0200 |
commit | a3a7f78ff87b1d583ca42b6a534764fdc8df6dab (patch) | |
tree | b3cc2a1b61adf47f253db30c9706f40bfe0cddc7 | |
parent | 61a0f08d5e0f76df8562642315b922343f162bcf (diff) | |
download | ptxdist-a3a7f78ff87b1d583ca42b6a534764fdc8df6dab.tar.gz ptxdist-a3a7f78ff87b1d583ca42b6a534764fdc8df6dab.tar.xz |
libffi: version bump 3.0.11 -> 3.0.13
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r-- | patches/libffi-3.0.11/0001-fix-powerpc-case.patch | 33 | ||||
-rwxr-xr-x | patches/libffi-3.0.11/autogen.sh | 6 | ||||
-rw-r--r-- | patches/libffi-3.0.11/series | 5 | ||||
-rw-r--r-- | patches/libffi-3.0.13/0001-install-header-files-to-includedir-and-adjust-libffi.patch (renamed from patches/libffi-3.0.11/0002-install-header-files-to-includedir-and-adjust-libffi.patch) | 4 | ||||
l--------- | patches/libffi-3.0.13/autogen.sh | 1 | ||||
-rw-r--r-- | patches/libffi-3.0.13/series | 4 | ||||
-rw-r--r-- | rules/libffi.make | 14 |
7 files changed, 10 insertions, 57 deletions
diff --git a/patches/libffi-3.0.11/0001-fix-powerpc-case.patch b/patches/libffi-3.0.11/0001-fix-powerpc-case.patch deleted file mode 100644 index 4c5ce2c46..000000000 --- a/patches/libffi-3.0.11/0001-fix-powerpc-case.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Robert Schwebel <r.schwebel@pengutronix.de> -Date: Thu, 14 Jun 2012 11:44:29 +0200 -Subject: [PATCH] libffi: fix duplicate case on powerpc 32 bit - -Without this fix, gcc complains about a duplicate case value: - -../src/powerpc/ffi.c: In function 'ffi_prep_cif_machdep': -../src/powerpc/ffi.c:670:5: error: duplicate case value -../src/powerpc/ffi.c:667:5: error: previously used here - -rsc: submitted as http://sourceware.org/ml/libffi-discuss/2012/msg00201.html - -Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> ---- - src/powerpc/ffi.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/powerpc/ffi.c b/src/powerpc/ffi.c -index baca694..257f02f 100644 ---- a/src/powerpc/ffi.c -+++ b/src/powerpc/ffi.c -@@ -664,9 +664,11 @@ ffi_prep_cif_machdep (ffi_cif *cif) - switch (type) - { - #ifndef __NO_FPRS__ -+#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE - case FFI_TYPE_LONGDOUBLE: - flags |= FLAG_RETURNS_128BITS; - /* Fall through. */ -+#endif - case FFI_TYPE_DOUBLE: - flags |= FLAG_RETURNS_64BITS; - /* Fall through. */ diff --git a/patches/libffi-3.0.11/autogen.sh b/patches/libffi-3.0.11/autogen.sh deleted file mode 100755 index 0244c9124..000000000 --- a/patches/libffi-3.0.11/autogen.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -set -e - -automake - diff --git a/patches/libffi-3.0.11/series b/patches/libffi-3.0.11/series deleted file mode 100644 index 08fb64c9c..000000000 --- a/patches/libffi-3.0.11/series +++ /dev/null @@ -1,5 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-fix-powerpc-case.patch -0002-install-header-files-to-includedir-and-adjust-libffi.patch -# 6a4e3935931e0b0433da3a0f41888342 - git-ptx-patches magic diff --git a/patches/libffi-3.0.11/0002-install-header-files-to-includedir-and-adjust-libffi.patch b/patches/libffi-3.0.13/0001-install-header-files-to-includedir-and-adjust-libffi.patch index 71bb53731..bc1bfcc1c 100644 --- a/patches/libffi-3.0.11/0002-install-header-files-to-includedir-and-adjust-libffi.patch +++ b/patches/libffi-3.0.13/0001-install-header-files-to-includedir-and-adjust-libffi.patch @@ -4,8 +4,8 @@ Subject: [PATCH] install header files to @includedir@ and adjust libffi.pc.in Signed-off-by: Jan Luebbe <jlu@pengutronix.de> --- - include/Makefile.am | 2 +- - libffi.pc.in | 6 +++--- + include/Makefile.am | 2 +- + libffi.pc.in | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/Makefile.am b/include/Makefile.am diff --git a/patches/libffi-3.0.13/autogen.sh b/patches/libffi-3.0.13/autogen.sh new file mode 120000 index 000000000..9f8a4cb7d --- /dev/null +++ b/patches/libffi-3.0.13/autogen.sh @@ -0,0 +1 @@ +../autogen.sh
\ No newline at end of file diff --git a/patches/libffi-3.0.13/series b/patches/libffi-3.0.13/series new file mode 100644 index 000000000..9b33d508a --- /dev/null +++ b/patches/libffi-3.0.13/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-install-header-files-to-includedir-and-adjust-libffi.patch +# 696c0d3147fe62cd23ca3cce21d7acb5 - git-ptx-patches magic diff --git a/rules/libffi.make b/rules/libffi.make index aae0df5fc..f620c69e6 100644 --- a/rules/libffi.make +++ b/rules/libffi.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LIBFFI) += libffi # # Paths and names # -LIBFFI_VERSION := 3.0.11 -LIBFFI_MD5 := f69b9693227d976835b4857b1ba7d0e3 +LIBFFI_VERSION := 3.0.13 +LIBFFI_MD5 := 45f3b6dbc9ee7c7dfbbbc5feba571529 LIBFFI := libffi-$(LIBFFI_VERSION) LIBFFI_SUFFIX := tar.gz LIBFFI_SOURCE := $(SRCDIR)/$(LIBFFI).$(LIBFFI_SUFFIX) @@ -37,6 +37,7 @@ LIBFFI_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ --disable-static \ --enable-portable-binary \ + --disable-pax_emutramp \ --disable-debug \ --enable-structs \ --enable-raw-api \ @@ -44,15 +45,6 @@ LIBFFI_CONF_OPT := \ --without-gcc-arch # ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/libffi.install: - @$(call targetinfo) - @$(call install, LIBFFI) - @$(call touch) - -# ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- |