Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 3c91f8d

Browse files
Remove softfloat from fetch & build phases (including config)
1 parent feb0346 commit 3c91f8d

File tree

3 files changed

+0
-39
lines changed

3 files changed

+0
-39
lines changed

‎scripts/build.sh‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,6 @@ cd "$(dirname ${BASH_SOURCE[0]})"
55
source config.sh
66
source "$BUILDDIR/metadata"
77

8-
if [ "$SFLT_NEEDED" == "true" ]; then
9-
echo "[BUILD] Building softfloat support"
10-
cd "$SFLTBUILD"
11-
make
12-
make DESTDIR="$SFLTPFX" install
13-
fi
14-
158
cd "$JDKDIR"
169

1710
# refresh patched build system
@@ -34,7 +27,6 @@ fi
3427
# - Force softfloat runtime: -D__SOFTFP__
3528
# Fix the "internal" string: --with-version-string="<version>"
3629
# Use correct JNI path: --with-jni-libpath=<dir1>:<dir2>...
37-
# Use softfloat libraries: --with-softfloat-lib=<softfloat.a> --with-softfloat-include=<dirname softfloat.h>
3830
# Use AdoptOpenJDK CA certs: --with-cacerts-file=<path>
3931
# Use correct debug level --with-debug-level=<level>
4032
# Help to find freetype: --with-freetype-lib=/usr/lib/arm-linux-gnueabi
@@ -65,7 +57,6 @@ if [ "$JDKPLATFORM" == "ev3" ]; then
6557
--disable-warnings-as-errors \
6658
--with-version-string="$JAVA_VERSION" \
6759
$JNI_PATH_FLAGS \
68-
$SOFTFLOAT_FLAGS \
6960
$VENDOR_FLAGS \
7061
--with-cacerts-file="$CACERTFILE" \
7162
--with-debug-level=$HOTSPOT_DEBUG \

‎scripts/config.sh‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,6 @@ SCRIPTDIR="$( cd "$(dirname "0ドル")" ; pwd -P )"
66
BUILDDIR="/build"
77
# jdk repository directory
88
JDKDIR="$BUILDDIR/jdk"
9-
# softfloat repository directory
10-
SFLTDIR="$BUILDDIR/sflt"
11-
# softfloat repository
12-
SFLTREPO="https://github.com/ev3dev-lang-java/softfloat-openjdk.git"
13-
# softfloat build directory
14-
SFLTBUILD="$SFLTDIR/build/Linux-ARM-VFPv2-GCC-OpenJDK"
15-
# softfloat license
16-
SFLTPFX="$SFLTDIR/output"
179
# openjdk-build repo dir
1810
ABLDDIR="$BUILDDIR/openjdk-build"
1911
# openjdk-build repo
@@ -166,7 +158,6 @@ if [ "$JDKVER" == "9" ]; then
166158
IMAGEDIR="$JDKDIR/build/linux-arm-normal-${JDKVM}-${HOTSPOT_DEBUG}/images"
167159
HOTSPOT_ABI=arm926ejs
168160
JNI_PATH_FLAGS=
169-
SOFTFLOAT_FLAGS=
170161
VENDOR_FLAGS=
171162

172163
# OpenJDK 10
@@ -189,7 +180,6 @@ elif [ "$JDKVER" == "10" ]; then
189180
IMAGEDIR="$JDKDIR/build/linux-arm-normal-${JDKVM}-${HOTSPOT_DEBUG}/images"
190181
HOTSPOT_ABI=arm926ejs
191182
JNI_PATH_FLAGS=
192-
SOFTFLOAT_FLAGS=
193183

194184
# OpenJDK 11
195185
elif [ "$JDKVER" == "11" ]; then
@@ -217,7 +207,6 @@ elif [ "$JDKVER" == "11" ]; then
217207
IMAGEDIR="$JDKDIR/build/linux-arm-normal-${JDKVM}-${HOTSPOT_DEBUG}/images"
218208
HOTSPOT_ABI=arm926ejs
219209
JNI_PATH_FLAGS=
220-
SOFTFLOAT_FLAGS=
221210

222211
# OpenJDK 12
223212
elif [ "$JDKVER" == "12" ]; then
@@ -245,10 +234,6 @@ elif [ "$JDKVER" == "12" ]; then
245234
IMAGEDIR="$JDKDIR/build/linux-arm-${JDKVM}-${HOTSPOT_DEBUG}/images"
246235
HOTSPOT_ABI=arm-sflt
247236
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"
248-
SOFTFLOAT_FLAGS="--with-sflt=$SFLTPFX"
249-
if [ "$JDKPLATFORM" == "ev3" ]; then
250-
SFLT_NEEDED=true
251-
fi
252237

253238
# OpenJDK 13
254239
elif [ "$JDKVER" == "13" ]; then
@@ -276,10 +261,6 @@ elif [ "$JDKVER" == "13" ]; then
276261
IMAGEDIR="$JDKDIR/build/linux-arm-${JDKVM}-${HOTSPOT_DEBUG}/images"
277262
HOTSPOT_ABI=arm-sflt
278263
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"
279-
SOFTFLOAT_FLAGS="--with-sflt=$SFLTPFX"
280-
if [ "$JDKPLATFORM" == "ev3" ]; then
281-
SFLT_NEEDED=true
282-
fi
283264

284265
# OpenJDK Loom & Master+dev
285266
elif [ "$JDKVER" == "loom" ] || [ "$JDKVER" == "tip" ]; then
@@ -314,10 +295,6 @@ elif [ "$JDKVER" == "loom" ] || [ "$JDKVER" == "tip" ]; then
314295
IMAGEDIR="$JDKDIR/build/linux-arm-${JDKVM}-${HOTSPOT_DEBUG}/images"
315296
HOTSPOT_ABI=arm-sflt
316297
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"
317-
SOFTFLOAT_FLAGS="--with-sflt=$SFLTPFX"
318-
if [ "$JDKPLATFORM" == "ev3" ]; then
319-
SFLT_NEEDED=true
320-
fi
321298

322299
# invalid or unset version
323300
else

‎scripts/fetch.sh‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -147,13 +147,6 @@ else
147147
fi
148148

149149

150-
if [ ! -d "$SFLTDIR" ] && [ "$SFLT_NEEDED" == "true" ]; then
151-
# clone the root project
152-
echo "[FETCH] Cloning SoftFloat repo"
153-
git clone --depth 1 "$SFLTREPO" "$SFLTDIR"
154-
fi
155-
156-
157150
if [ -d "$ABLDDIR" ]; then
158151
rm -rf "$ABLDDIR"
159152
fi

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /