Use libffi-3.3-rc0 for armeabi-v7a

Author: ViliusSutkus89

3rdparty/packages/glib-2.0.cmake

@@ -1,13 +1,7 @@
 include_guard(GLOBAL)
 
-# armeabi-v7a fails to build libffi. However, glib-2.0 manages to build it internally.
-SET(LIBFFI_DEPENDENCY libffi)
-if(ANDROID_ABI STREQUAL armeabi-v7a)
-  SET(LIBFFI_DEPENDENCY)
-endif()
-
 ExternalProjectMeson(glib-2.0
-  DEPENDS iconv libintl ${LIBFFI_DEPENDENCY}
+  DEPENDS iconv libintl zlib libffi
   URL https://ftp.gnome.org/pub/gnome/sources/glib/2.61/glib-2.61.1.tar.xz
   URL_HASH SHA256=f8d827955f0d8e197ff5c2105dd6ac4f6b63d15cd021eb1de66534c92a762161
   CONFIGURE_ARGUMENTS -Dlibmount=false

3rdparty/packages/libffi.cmake

@@ -1,6 +1,17 @@
 include_guard(GLOBAL)
 
-ExternalProjectAutotools(libffi
-  URL ftp://sourceware.org/pub/libffi/libffi-3.2.1.tar.gz
-  URL_HASH SHA256=d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37
-)
+# libffi-3.2.1 fails to build on armeabi-v7a ABI
+# https://github.com/libffi/libffi/issues/478
+# Use 3.3-rc0
+
+if(ANDROID_ABI STREQUAL armeabi-v7a)
+  ExternalProjectAutotools(libffi
+    URL https://github.com/libffi/libffi/releases/download/v3.3-rc0/libffi-3.3-rc0.tar.gz
+    URL_HASH SHA256=403d67aabf1c05157855ea2b1d9950263fb6316536c8c333f5b9ab1eb2f20ecf
+  )
+else()
+  ExternalProjectAutotools(libffi
+    URL ftp://sourceware.org/pub/libffi/libffi-3.2.1.tar.gz
+    URL_HASH SHA256=d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37
+  )
+endif()