Update libffi to version post v3.3RC0 and adapt it to be NDK 19 compatible

Author: opacam

pythonforandroid/recipes/libffi/__init__.py

@@ -1,8 +1,7 @@
 from os.path import exists, join
 from pythonforandroid.recipe import Recipe
-from pythonforandroid.logger import info, shprint
+from pythonforandroid.logger import shprint
 from pythonforandroid.util import current_directory, ensure_dir
-from glob import glob
 import sh
 
 
@@ -14,14 +13,11 @@ class LibffiRecipe(Recipe):
         - `libltdl-dev` which defines the `LT_SYS_SYMBOL_USCORE` macro
     """
     name = 'libffi'
-    version = '3.2.1'
-    url = 'https://github.com/libffi/libffi/archive/v{version}.tar.gz'
+    # Version pinned to post `v3.3RC0`
+    version = '8fa8837'
+    url = 'https://github.com/libffi/libffi/archive/{version}.tar.gz'
 
-    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']
+    patches = ['remove-version-info.patch']
 
     def should_build(self, arch):
         return not exists(join(self.ctx.get_libs_dir(arch.arch), 'libffi.so'))
@@ -37,50 +33,11 @@ def build_arch(self, arch):
                     '--prefix=' + self.get_build_dir(arch.arch),
                     '--disable-builddir',
                     '--enable-shared', _env=env)
-            # '--with-sysroot={}'.format(self.ctx.ndk_platform),
-            # '--target={}'.format(arch.toolchain_prefix),
-
-            # ndk 15 introduces unified headers required --sysroot and
-            # -isysroot for libraries and headers. libtool's head explodes
-            # trying to weave them into it's own magic. The result is a link
-            # failure trying to link libc. We call make to compile the bits
-            # and manually link...
-
-            try:
-                shprint(sh.make, '-j5', 'libffi.la', _env=env)
-            except sh.ErrorReturnCode_2:
-                info("make libffi.la failed as expected")
-            cc = sh.Command(env['CC'].split()[0])
-            cflags = env['CC'].split()[1:]
-            host_build = self.get_build_dir(arch.arch)
-
-            arch_flags = ''
-            if '-march=' in env['CFLAGS']:
-                arch_flags = '-march={}'.format(env['CFLAGS'].split('-march=')[1])
-
-            src_arch = arch.command_prefix.split('-')[0]
-            if src_arch == 'x86_64':
-                # libffi has not specific arch files for x86_64...so...using
-                # the ones from x86 which seems to build fine...
-                src_arch = 'x86'
-
-            cflags.extend(arch_flags.split())
-            cflags.extend(['-shared', '-fPIC', '-DPIC'])
-            cflags.extend(glob(join(host_build, 'src/.libs/*.o')))
-            cflags.extend(glob(join(host_build, 'src', src_arch, '.libs/*.o')))
-
-            ldflags = env['LDFLAGS'].split()
-            cflags.extend(ldflags)
-            cflags.extend(['-Wl,-soname', '-Wl,libffi.so', '-o',
-                           '.libs/libffi.so'])
-
-            with current_directory(host_build):
-                shprint(cc, *cflags, _env=env)
-
+            shprint(sh.make, '-j5', 'libffi.la', _env=env)
             ensure_dir(self.ctx.get_libs_dir(arch.arch))
-            shprint(sh.cp,
-                    join(host_build, '.libs', 'libffi.so'),
-                    self.ctx.get_libs_dir(arch.arch))
+            self.install_libs(
+                arch, join(self.get_build_dir(arch.arch), '.libs', 'libffi.so')
+            )
 
     def get_include_dirs(self, arch):
         return [join(self.get_build_dir(arch.arch), 'include')]

pythonforandroid/recipes/libffi/fix-includedir.patch

@@ -1,12 +1,11 @@
-diff -Naur libffi/Makefile.am b/Makefile.am
---- libffi/Makefile.am	2014-11-12 06:00:59.000000000 -0600
-+++ b/Makefile.am	2015-12-23 15:57:10.363148806 -0600
-@@ -249,7 +249,7 @@
- AM_CFLAGS += -DFFI_DEBUG
- endif
- 
--libffi_la_LDFLAGS = -no-undefined -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) $(AM_LTLDFLAGS)
+--- libffi/Makefile.am.orig	2018-12-21 16:11:26.159181262 +0100
++++ libffi/Makefile.am	2018-12-21 16:14:44.075179374 +0100
+@@ -156,7 +156,7 @@
+ libffi.map: $(top_srcdir)/libffi.map.in
+ 	$(COMPILE) -D$(TARGET) -E -x assembler-with-cpp -o $@ $<
+
+-libffi_la_LDFLAGS = -no-undefined $(libffi_version_info) $(libffi_version_script) $(LTLDFLAGS) $(AM_LTLDFLAGS)
 +libffi_la_LDFLAGS = -no-undefined -avoid-version $(LTLDFLAGS) $(AM_LTLDFLAGS)
- 
+ libffi_la_DEPENDENCIES = $(libffi_la_LIBADD) $(libffi_version_dep)
+
  AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src
- AM_CCASFLAGS = $(AM_CPPFLAGS)