Remove softfloat from fetch & build phases (including config)

Author: JakubVanek

scripts/build.sh

@@ -5,13 +5,6 @@ cd "$(dirname ${BASH_SOURCE[0]})"
 source config.sh
 source "$BUILDDIR/metadata"
 
-if [ "$SFLT_NEEDED" == "true" ]; then
-  echo "[BUILD] Building softfloat support"
-  cd "$SFLTBUILD"
-  make
-  make DESTDIR="$SFLTPFX" install
-fi
-
 cd "$JDKDIR"
 
 # refresh patched build system
@@ -34,7 +27,6 @@ fi
 #   - Force softfloat runtime:  -D__SOFTFP__
 # Fix the "internal" string:   --with-version-string="<version>"
 # Use correct JNI path:        --with-jni-libpath=<dir1>:<dir2>...
-# Use softfloat libraries:     --with-softfloat-lib=<softfloat.a> --with-softfloat-include=<dirname softfloat.h>
 # Use AdoptOpenJDK CA certs:   --with-cacerts-file=<path>
 # Use correct debug level      --with-debug-level=<level>
 # Help to find freetype:       --with-freetype-lib=/usr/lib/arm-linux-gnueabi
@@ -65,7 +57,6 @@ if [ "$JDKPLATFORM" == "ev3" ]; then
                    --disable-warnings-as-errors \
                    --with-version-string="$JAVA_VERSION" \
                    $JNI_PATH_FLAGS \
-                   $SOFTFLOAT_FLAGS \
                    $VENDOR_FLAGS \
                    --with-cacerts-file="$CACERTFILE" \
                    --with-debug-level=$HOTSPOT_DEBUG \

scripts/config.sh

@@ -6,14 +6,6 @@ SCRIPTDIR="$( cd "$(dirname "$0")" ; pwd -P )"
 BUILDDIR="/build"
 # jdk repository directory
 JDKDIR="$BUILDDIR/jdk"
-# softfloat repository directory
-SFLTDIR="$BUILDDIR/sflt"
-# softfloat repository
-SFLTREPO="https://github.com/ev3dev-lang-java/softfloat-openjdk.git"
-# softfloat build directory
-SFLTBUILD="$SFLTDIR/build/Linux-ARM-VFPv2-GCC-OpenJDK"
-# softfloat license
-SFLTPFX="$SFLTDIR/output"
 # openjdk-build repo dir
 ABLDDIR="$BUILDDIR/openjdk-build"
 # openjdk-build repo
@@ -166,7 +158,6 @@ if [ "$JDKVER" == "9" ]; then
   IMAGEDIR="$JDKDIR/build/linux-arm-normal-${JDKVM}-${HOTSPOT_DEBUG}/images"
   HOTSPOT_ABI=arm926ejs
   JNI_PATH_FLAGS=
-  SOFTFLOAT_FLAGS=
   VENDOR_FLAGS=
 
 # OpenJDK 10
@@ -189,7 +180,6 @@ elif [ "$JDKVER" == "10" ]; then
   IMAGEDIR="$JDKDIR/build/linux-arm-normal-${JDKVM}-${HOTSPOT_DEBUG}/images"
   HOTSPOT_ABI=arm926ejs
   JNI_PATH_FLAGS=
-  SOFTFLOAT_FLAGS=
 
 # OpenJDK 11
 elif [ "$JDKVER" == "11" ]; then
@@ -217,7 +207,6 @@ elif [ "$JDKVER" == "11" ]; then
   IMAGEDIR="$JDKDIR/build/linux-arm-normal-${JDKVM}-${HOTSPOT_DEBUG}/images"
   HOTSPOT_ABI=arm926ejs
   JNI_PATH_FLAGS=
-  SOFTFLOAT_FLAGS=
 
 # OpenJDK 12
 elif [ "$JDKVER" == "12" ]; then
@@ -245,10 +234,6 @@ elif [ "$JDKVER" == "12" ]; then
   IMAGEDIR="$JDKDIR/build/linux-arm-${JDKVM}-${HOTSPOT_DEBUG}/images"
   HOTSPOT_ABI=arm-sflt
   JNI_PATH_FLAGS="--with-jni-libpath=/usr/lib/$DEB_HOST_MULTIARCH/jni:/lib/$DEB_HOST_MULTIARCH:/usr/lib/$DEB_HOST_MULTIARCH:/usr/lib/jni:/lib:/usr/lib"
-  SOFTFLOAT_FLAGS="--with-sflt=$SFLTPFX"
-  if [ "$JDKPLATFORM" == "ev3" ]; then
-    SFLT_NEEDED=true
-  fi
 
 # OpenJDK 13
 elif [ "$JDKVER" == "13" ]; then
@@ -276,10 +261,6 @@ elif [ "$JDKVER" == "13" ]; then
   IMAGEDIR="$JDKDIR/build/linux-arm-${JDKVM}-${HOTSPOT_DEBUG}/images"
   HOTSPOT_ABI=arm-sflt
   JNI_PATH_FLAGS="--with-jni-libpath=/usr/lib/$DEB_HOST_MULTIARCH/jni:/lib/$DEB_HOST_MULTIARCH:/usr/lib/$DEB_HOST_MULTIARCH:/usr/lib/jni:/lib:/usr/lib"
-  SOFTFLOAT_FLAGS="--with-sflt=$SFLTPFX"
-  if [ "$JDKPLATFORM" == "ev3" ]; then
-    SFLT_NEEDED=true
-  fi
 
 # OpenJDK Loom & Master+dev
 elif [ "$JDKVER" == "loom" ] || [ "$JDKVER" == "tip" ]; then
@@ -314,10 +295,6 @@ elif [ "$JDKVER" == "loom" ] || [ "$JDKVER" == "tip" ]; then
   IMAGEDIR="$JDKDIR/build/linux-arm-${JDKVM}-${HOTSPOT_DEBUG}/images"
   HOTSPOT_ABI=arm-sflt
   JNI_PATH_FLAGS="--with-jni-libpath=/usr/lib/$DEB_HOST_MULTIARCH/jni:/lib/$DEB_HOST_MULTIARCH:/usr/lib/$DEB_HOST_MULTIARCH:/usr/lib/jni:/lib:/usr/lib"
-  SOFTFLOAT_FLAGS="--with-sflt=$SFLTPFX"
-  if [ "$JDKPLATFORM" == "ev3" ]; then
-    SFLT_NEEDED=true
-  fi
 
 # invalid or unset version
 else

scripts/fetch.sh

@@ -147,13 +147,6 @@ else
 fi
 
 
-if [ ! -d "$SFLTDIR" ] && [ "$SFLT_NEEDED" == "true" ]; then
-  # clone the root project
-  echo "[FETCH] Cloning SoftFloat repo"
-  git clone --depth 1 "$SFLTREPO" "$SFLTDIR"
-fi
-
-
 if [ -d "$ABLDDIR" ]; then
   rm -rf "$ABLDDIR"
 fi