From 2339a827c21da5dc4e8c4b4a5c9a5bb5ad702f54 Mon Sep 17 00:00:00 2001
From: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
Date: Fri, 29 Apr 2016 01:12:30 +0300
Subject: [PATCH] libffi: bump to version 3.2.1

Among many fixes and improvements this new version adds
support of ARC architecture (ARC port was actually introduced
in v3.1 but while at it why not to update to the most recent version).
Which allows to build dependent projects like Python etc.

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
---
 libs/libffi/Makefile                          |  6 ++--
 .../patches/001-fix-includedir-pkg.patch      | 36 -------------------
 2 files changed, 3 insertions(+), 39 deletions(-)
 delete mode 100644 libs/libffi/patches/001-fix-includedir-pkg.patch

diff --git a/libs/libffi/Makefile b/libs/libffi/Makefile
index cd16a85ff..b5daa13b6 100644
--- a/libs/libffi/Makefile
+++ b/libs/libffi/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libffi
-PKG_VERSION:=3.0.13
+PKG_VERSION:=3.2.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://sourceware.org/pub/libffi/
-PKG_MD5SUM:=45f3b6dbc9ee7c7dfbbbc5feba571529
+PKG_MD5SUM:=83b89587607e3eb65c70d361f13bab43
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
@@ -66,7 +66,7 @@ define Build/InstallDev
 
 	$(INSTALL_DIR) $(1)/usr/include
 	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/include/*.h \
+		$(PKG_INSTALL_DIR)/usr/lib/$(PKG_NAME)-$(PKG_VERSION)/include/*.h \
 		$(1)/usr/include/
 endef
 
diff --git a/libs/libffi/patches/001-fix-includedir-pkg.patch b/libs/libffi/patches/001-fix-includedir-pkg.patch
deleted file mode 100644
index 812d7a4e0..000000000
--- a/libs/libffi/patches/001-fix-includedir-pkg.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/libffi.pc.in
-+++ b/libffi.pc.in
-@@ -1,10 +1,10 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
--includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
-+includedir=@includedir@
- 
- Name: @PACKAGE_NAME@
- Description: Library supporting Foreign Function Interfaces
- Version: @PACKAGE_VERSION@
--Libs: -L${libdir} -lffi
--Cflags: -I${includedir}
-+Libs: -lffi
-+Cflags:
---- a/include/Makefile.am
-+++ b/include/Makefile.am
-@@ -5,5 +5,5 @@ AUTOMAKE_OPTIONS=foreign
- DISTCLEANFILES=ffitarget.h
- EXTRA_DIST=ffi.h.in ffi_common.h
- 
--includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
-+includesdir = $(includedir)
- nodist_includes_HEADERS = ffi.h ffitarget.h
---- a/include/Makefile.in
-+++ b/include/Makefile.in
-@@ -250,7 +250,7 @@ top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = foreign
- DISTCLEANFILES = ffitarget.h
- EXTRA_DIST = ffi.h.in ffi_common.h
--includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
-+includesdir = $(includedir)
- nodist_includes_HEADERS = ffi.h ffitarget.h
- all: all-am
-