Fix libffi includedir

Because the python3's recipe uses pkg-config to link with the libffi library, and pkg-config reads the libffi.pc file which does not have the right values for us because we never performed the install for the libffi recipe. With this, we will make sure that the libffi.pc files has the standard header values so the python build could make use of it and explicitly link with our library.

Author: opacam

pythonforandroid/recipes/libffi/__init__.py

@@ -17,7 +17,11 @@ class LibffiRecipe(Recipe):
     version = '3.2.1'
     url = 'https://github.com/libffi/libffi/archive/v{version}.tar.gz'
 
-    patches = ['remove-version-info.patch']
+    patches = ['remove-version-info.patch',
+               # This patch below is already included into libffi's master
+               # branch and included in the pre-release 3.3rc0...so we should
+               # remove this when we update the version number for libffi
+               'fix-includedir.patch']
 
     def should_build(self, arch):
         return not exists(join(self.ctx.get_libs_dir(arch.arch), 'libffi.so'))
@@ -30,7 +34,7 @@ def build_arch(self, arch):
             shprint(sh.Command('autoreconf'), '-vif', _env=env)
             shprint(sh.Command('./configure'),
                     '--host=' + arch.command_prefix,
-                    '--prefix=' + self.ctx.get_python_install_dir(),
+                    '--prefix=' + self.get_build_dir(arch.arch),
                     '--disable-builddir',
                     '--enable-shared', _env=env)
             # '--with-sysroot={}'.format(self.ctx.ndk_platform),

pythonforandroid/recipes/libffi/fix-includedir.patch

@@ -0,0 +1,34 @@
+From 982b89c01aca99c7bc229914fc1521f96930919b Mon Sep 17 00:00:00 2001
+From: Yen Chi Hsuan <[email protected]>
+Date: Sun, 13 Nov 2016 19:17:19 +0800
+Subject: [PATCH] Install public headers in the standard path
+
+---
+ include/Makefile.am | 3 +--
+ libffi.pc.in        | 2 +-
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/include/Makefile.am b/include/Makefile.am
+index bb241e88..c59df9fb 100644
+--- a/include/Makefile.am
++++ b/include/Makefile.am
+@@ -6,5 +6,4 @@ DISTCLEANFILES=ffitarget.h
+ noinst_HEADERS=ffi_common.h ffi_cfi.h
+ EXTRA_DIST=ffi.h.in
+
+-includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
+-nodist_includes_HEADERS = ffi.h ffitarget.h
++nodist_include_HEADERS = ffi.h ffitarget.h
+diff --git a/libffi.pc.in b/libffi.pc.in
+index edf6fde5..6fad83b4 100644
+--- a/libffi.pc.in
++++ b/libffi.pc.in
+@@ -2,7 +2,7 @@ prefix=@prefix@
+ 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