From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefan Schantl <stefan.schantl@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] libffi: Update to 3.2.1
Date: Mon, 05 Sep 2016 14:27:22 +0200
Message-ID: <1473078442-29012-1-git-send-email-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5783771157246151900=="
List-Id: <development.lists.ipfire.org>

--===============5783771157246151900==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This is an update to the latest stable version of libffi.

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 libffi/libffi.nm                                   | 18 ++++++++++--
 .../patches/libffi-3.0.13-fix-include-path.patch   | 34 --------------------=
--
 2 files changed, 15 insertions(+), 37 deletions(-)
 delete mode 100644 libffi/patches/libffi-3.0.13-fix-include-path.patch

diff --git a/libffi/libffi.nm b/libffi/libffi.nm
index db6ba4f..6990611 100644
--- a/libffi/libffi.nm
+++ b/libffi/libffi.nm
@@ -4,7 +4,7 @@
 ############################################################################=
###
=20
 name       =3D libffi
-version    =3D 3.0.13
+version    =3D 3.2.1
 release    =3D 1
=20
 groups     =3D System/Libraries
@@ -13,13 +13,25 @@ license    =3D BSD
 summary    =3D A portable foreign function interface library.
=20
 description
-	The libffi library provides a portable, high level programming \
-	interface to various calling conventions. This allows a programmer to \
+	The libffi library provides a portable, high level programming
+	interface to various calling conventions. This allows a programmer to
 	call any function specified by a call interface description at run time.
 end
=20
 source_dl  =3D ftp://sourceware.org/pub/libffi/
=20
+build
+	prepare_cmds
+		# Fix include directories.
+		sed -e '/^includesdir/ s/$(libdir).*$/$(includedir)/' \
+			-i include/Makefile.in
+
+		sed -e '/^includedir/ s/=3D.*$/=3D@includedir@/' \
+			-e 's/^Cflags: -I${includedir}/Cflags:/' \
+			-i libffi.pc.in
+	end
+end
+
 packages
 	package %{name}
=20
diff --git a/libffi/patches/libffi-3.0.13-fix-include-path.patch b/libffi/pat=
ches/libffi-3.0.13-fix-include-path.patch
deleted file mode 100644
index 4502333..0000000
--- a/libffi/patches/libffi-3.0.13-fix-include-path.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -up libffi-3.0.13/include/Makefile.am.fixpath libffi-3.0.13/include/Mak=
efile.am
---- libffi-3.0.13/include/Makefile.am.fixpath	2013-05-25 22:11:25.983889342 =
-0400
-+++ libffi-3.0.13/include/Makefile.am	2013-05-25 22:12:12.337890037 -0400
-@@ -5,5 +5,5 @@ AUTOMAKE_OPTIONS=3Dforeign
- DISTCLEANFILES=3Dffitarget.h
- EXTRA_DIST=3Dffi.h.in ffi_common.h
-=20
--includesdir =3D $(libdir)/@PACKAGE_NAME(a)-@PACKAGE_VERSION@/include
-+includesdir =3D $(includedir)/
- nodist_includes_HEADERS =3D ffi.h ffitarget.h
-diff -up libffi-3.0.13/include/Makefile.in.fixpath libffi-3.0.13/include/Mak=
efile.in
---- libffi-3.0.13/include/Makefile.in.fixpath	2013-05-25 22:12:56.259890696 =
-0400
-+++ libffi-3.0.13/include/Makefile.in	2013-05-25 22:13:12.101890934 -0400
-@@ -250,7 +250,7 @@ top_srcdir =3D @top_srcdir@
- AUTOMAKE_OPTIONS =3D foreign
- DISTCLEANFILES =3D ffitarget.h
- EXTRA_DIST =3D ffi.h.in ffi_common.h
--includesdir =3D $(libdir)/@PACKAGE_NAME(a)-@PACKAGE_VERSION@/include
-+includesdir =3D $(includedir)/
- nodist_includes_HEADERS =3D ffi.h ffitarget.h
- all: all-am
-=20
-diff -up libffi-3.0.13/libffi.pc.in.fixpath libffi-3.0.13/libffi.pc.in
---- libffi-3.0.13/libffi.pc.in.fixpath	2013-05-25 22:14:21.037891968 -0400
-+++ libffi-3.0.13/libffi.pc.in	2013-05-25 22:14:31.652892128 -0400
-@@ -1,7 +1,7 @@
- prefix=3D@prefix@
- exec_prefix=3D@exec_prefix@
- libdir=3D@libdir@
--includedir=3D${libdir}/@PACKAGE_NAME(a)-@PACKAGE_VERSION@/include
-+includedir=3D@includedir@
-=20
- Name: @PACKAGE_NAME@
- Description: Library supporting Foreign Function Interfaces
--=20
2.7.4


--===============5783771157246151900==--