4 files changed, 23 insertions, 21 deletions
diff --git a/package/libffi/patches/patch-Makefile_in b/package/libffi/patches/patch-Makefile_in
deleted file mode 100644
index e7888ea74..000000000
--- a/package/libffi/patches/patch-Makefile_in
+++ /dev/null
@@ -1,10 +0,0 @@
---- libffi-3.0.9.orig/Makefile.in	2009-12-31 13:41:43.000000000 +0100
-+++ libffi-3.0.9/Makefile.in	2010-01-08 16:59:03.198809559 +0100
-@@ -446,6 +446,7 @@ AM_MAKEFLAGS = \
- 	"RUNTESTFLAGS=$(RUNTESTFLAGS)" \
- 	"SHELL=$(SHELL)" \
- 	"exec_prefix=$(exec_prefix)" \
-+	"includesdir=$(prefix)/include" \
- 	"infodir=$(infodir)" \
- 	"libdir=$(libdir)" \
- 	"prefix=$(prefix)" \
diff --git a/package/libffi/patches/patch-configure_ac b/package/libffi/patches/patch-configure_ac
new file mode 100644
index 000000000..32be1a3f7
--- /dev/null
+++ b/package/libffi/patches/patch-configure_ac
@@ -0,0 +1,14 @@
+--- libffi-3.0.13.orig/configure.ac	2013-03-17 23:36:15.000000000 +0100
++++ libffi-3.0.13/configure.ac	2013-12-05 15:58:33.000000000 +0100
+@@ -546,11 +546,6 @@ if test "x$GCC" = "xyes"; then
+     toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
+     toolexeclibdir='$(libdir)'
+   fi
+-  multi_os_directory=`$CC -print-multi-os-directory`
+-  case $multi_os_directory in
+-    .) ;; # Avoid trailing /.
+-    ../*) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
+-  esac
+   AC_SUBST(toolexecdir)
+ else
+   toolexeclibdir='$(libdir)'
diff --git a/package/libffi/patches/patch-include_Makefile_am b/package/libffi/patches/patch-include_Makefile_am
new file mode 100644
index 000000000..1602b5457
--- /dev/null
+++ b/package/libffi/patches/patch-include_Makefile_am
@@ -0,0 +1,9 @@
+--- libffi-3.0.13.orig/include/Makefile.am	2013-03-16 12:19:39.000000000 +0100
++++ libffi-3.0.13/include/Makefile.am	2013-12-05 16:33:48.000000000 +0100
+@@ -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 = $(prefix)/include
+ nodist_includes_HEADERS = ffi.h ffitarget.h
diff --git a/package/libffi/patches/patch-include_Makefile_in b/package/libffi/patches/patch-include_Makefile_in
deleted file mode 100644
index 29e406b1e..000000000
--- a/package/libffi/patches/patch-include_Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libffi-3.0.9.orig/include/Makefile.in	2009-12-31 13:41:01.000000000 +0100
-+++ libffi-3.0.9/include/Makefile.in	2010-01-08 16:59:54.165484176 +0100
-@@ -203,7 +203,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 = $(includesdir)
- nodist_includes_HEADERS = ffi.h ffitarget.h
- all: all-am
-