From b794354b9ef0e28a798556b7d2b41c6a362999d9 Mon Sep 17 00:00:00 2001
From: gixxpunk <thomas.harfmann@gmail.com>
Date: Mon, 25 Sep 2017 13:19:30 +0200
Subject: [PATCH] - libffi: add patch to correct header install path

---
 archive-patches/libffi-install_headers.patch | 34 ++++++++++++++++++++
 make/system-libs.mk                          |  4 +--
 2 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 archive-patches/libffi-install_headers.patch

diff --git a/archive-patches/libffi-install_headers.patch b/archive-patches/libffi-install_headers.patch
new file mode 100644
index 00000000..d2bf7237
--- /dev/null
+++ b/archive-patches/libffi-install_headers.patch
@@ -0,0 +1,34 @@
+Submitted By:            Armin K. <krejzi at email dot com>
+Date:                    2012-03-29
+Initial Package Version: 3.0.10
+Upstream Status:         Not Submitted
+Origin:                  Self
+Description:             Makes package install headers into /usr/include instead 
+                         of /usr/lib/libffi-3.0.10/include
+
+--- libffi.orig/include/Makefile.in	2011-08-23 16:28:35.000000000 +0200
++++ libffi/include/Makefile.in	2012-03-29 19:57:53.919343783 +0200
+@@ -314,7 +314,7 @@
+ 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
+ 
+--- libffi.orig/libffi.pc.in	2011-08-22 20:38:12.000000000 +0200
++++ libffi/libffi.pc.in	2012-03-29 19:57:18.263549738 +0200
+@@ -2,10 +2,10 @@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ toolexeclibdir=@toolexeclibdir@
+-includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
++includedir=@includedir@
+ 
+ Name: @PACKAGE_NAME@
+ Description: Library supporting Foreign Function Interfaces
+ Version: @PACKAGE_VERSION@
+ Libs: -L${toolexeclibdir} -lffi
+-Cflags: -I${includedir}
++Cflags 
diff --git a/make/system-libs.mk b/make/system-libs.mk
index 9e2443d1..ea8980f9 100644
--- a/make/system-libs.mk
+++ b/make/system-libs.mk
@@ -989,7 +989,7 @@ $(D)/libfribidi: $(ARCHIVE)/fribidi-$(FRIBIDI_VER).tar.bz2 | $(TARGETPREFIX)
 $(D)/libffi: $(ARCHIVE)/libffi-$(LIBFFI_VER).tar.gz
 	$(UNTAR)/libffi-$(LIBFFI_VER).tar.gz
 	set -e; cd $(BUILD_TMP)/libffi-$(LIBFFI_VER); \
-		autoreconf -fi; \
+	$(PATCH)/libffi-install_headers.patch; \
 		$(CONFIGURE) \
 			--prefix= \
 			--datarootdir=/.remove \
@@ -998,8 +998,6 @@ $(D)/libffi: $(ARCHIVE)/libffi-$(LIBFFI_VER).tar.gz
 		; \
 		$(MAKE) all; \
 		$(MAKE) install DESTDIR=$(TARGETPREFIX)
-	mv $(TARGETLIB)/libffi-$(LIBFFI_VER)/include/*.h $(TARGETINCLUDE)
-	rm -rf $(TARGETLIB)/libffi-$(LIBFFI_VER)
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libffi.pc
 	$(REWRITE_LIBTOOL)/libffi.la
 	$(REMOVE)/libffi-$(LIBFFI_VER)