From 39a25b42feff0fd12190bd4455d446b4d777b802 Mon Sep 17 00:00:00 2001
From: Duy Tran Khanh <khanhduytran0@users.noreply.github.com>
Date: Wed, 22 Sep 2021 06:17:59 +0700
Subject: [PATCH] libffi

---
 buildjdk.sh  | 12 ++++--------
 buildlibs.sh | 10 ++++++++--
 getlibs.sh   |  4 ++++
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/buildjdk.sh b/buildjdk.sh
index 1cf3df5..cbfb3d1 100755
--- a/buildjdk.sh
+++ b/buildjdk.sh
@@ -41,14 +41,6 @@ if [ "$BUILD_IOS" != "1" ]; then
   ar cru dummy_libs/libpthread.a
   ar cru dummy_libs/libthread_db.a
 else
-  wget https://github.com/libffi/libffi/releases/download/v3.4.2/libffi-3.4.2.tar.gz
-  tar xvf libffi-3.4.2.tar.gz
-  cd libffi-3.4.2
-  python generate-darwin-source-and-headers.py --only-ios
-  xcodebuild -arch arm64
-  cd build_iphoneos-arm64
-  make prefix=`pwd` install
-
   ln -s -f /opt/X11/include/X11 $ANDROID_INCLUDE/
   platform_args="--with-toolchain-type=clang"
   # --disable-precompiled-headers
@@ -63,6 +55,8 @@ fi
 # fix building libjawt
 ln -s -f $CUPS_DIR/cups $ANDROID_INCLUDE/
 
+LIBFFI_DIR=libffi-3.4.2/build_iphoneos-arm64
+
 cd openjdk
 #rm -rf build
 
@@ -83,6 +77,8 @@ bash ./configure \
     --with-fontconfig-include=$ANDROID_INCLUDE \
     --with-freetype-lib=$FREETYPE_DIR/lib \
     --with-freetype-include=$FREETYPE_DIR/include/freetype2 \
+    --with-libffi-include=$LIBFFI_DIR/include \
+    --with-libffi-lib=$LIBFFI_DIR/lib \
     $AUTOCONF_x11arg $AUTOCONF_EXTRA_ARGS \
     --x-libraries=/usr/lib \
         $platform_args || \
diff --git a/buildlibs.sh b/buildlibs.sh
index e833be9..a6f4cfe 100755
--- a/buildlibs.sh
+++ b/buildlibs.sh
@@ -6,10 +6,16 @@ cd freetype-$BUILD_FREETYPE_VERSION
 echo "Building Freetype"
 
 if [ "$BUILD_IOS" == "1" ]; then
-  LDFLAGS=-"arch arm64 -isysroot $thesysroot -miphoneos-version-min=12.0"
-
   export CC=$thecc
   export CXX=$thecxx
+  LDFLAGS=-"arch arm64 -isysroot $thesysroot -miphoneos-version-min=12.0"
+
+  cd libffi-3.4.2
+  python generate-darwin-source-and-headers.py --only-ios
+  xcodebuild -arch arm64
+  cd build_iphoneos-arm64
+  make prefix=`pwd` install
+
   ./configure \
     --host=$TARGET \
     --prefix=${PWD}/build_android-${TARGET_SHORT} \
diff --git a/getlibs.sh b/getlibs.sh
index 7b9bc84..7621588 100755
--- a/getlibs.sh
+++ b/getlibs.sh
@@ -6,6 +6,10 @@ set -e
 
 wget https://downloads.sourceforge.net/project/freetype/freetype2/$BUILD_FREETYPE_VERSION/freetype-$BUILD_FREETYPE_VERSION.tar.gz
 tar xf freetype-$BUILD_FREETYPE_VERSION.tar.gz
+
 wget https://github.com/apple/cups/releases/download/v2.2.4/cups-2.2.4-source.tar.gz
 tar xf cups-2.2.4-source.tar.gz
 rm cups-2.2.4-source.tar.gz freetype-$BUILD_FREETYPE_VERSION.tar.gz
+
+wget https://github.com/libffi/libffi/releases/download/v3.4.2/libffi-3.4.2.tar.gz
+tar xvf libffi-3.4.2.tar.gz