File tree Expand file tree Collapse file tree 3 files changed +19
-2
lines changed
Expand file tree Collapse file tree 3 files changed +19
-2
lines changed Original file line number Diff line number Diff line change @@ -55,6 +55,8 @@ if [ "$JDKPLATFORM" == "ev3" ]; then
5555 --with-extra-cxxflags=" -w -Wno-error -D__SOFTFP__" \
5656 --with-version-string=" $JAVA_VERSION " \
5757 --with-softfloat=" $SFLTLIB " \
58+ --with-cacerts-file=" $CACERTFILE " \
59+ --with-debug-level=release \
5860 AR=" arm-linux-gnueabi-gcc-ar" \
5961 NM=" arm-linux-gnueabi-gcc-nm" \
6062 BUILD_AR=" gcc-ar" \
@@ -75,6 +77,8 @@ elif [ "$JDKPLATFORM" == "rpi1" ] ||
7577 --with-extra-cxxflags=" -w -Wno-error" \
7678 --with-version-string=" $JAVA_VERSION " \
7779 --without-softfloat
80+ --with-cacerts-file=" $CACERTFILE " \
81+ --with-debug-level=release \
7882 AR=" arm-linux-gnueabi-gcc-ar" \
7983 NM=" arm-linux-gnueabi-gcc-nm" \
8084 BUILD_AR=" gcc-ar" \
Original file line number Diff line number Diff line change @@ -5,15 +5,21 @@ SCRIPTDIR="$( cd "$(dirname "$0")" ; pwd -P )"
55# output directory
66BUILDDIR=" /build"
77# jdk repository directory
8- JDKDIR=" /build /jdk"
8+ JDKDIR=" $BUILDDIR /jdk"
99# softfloat repository directory
10- SFLTDIR=" /build /sflt"
10+ SFLTDIR=" $BUILDDIR /sflt"
1111# softfloat repository
1212SFLTREPO=" https://github.com/ev3dev-lang-java/softfloat-openjdk.git"
1313# softfloat build directory
1414SFLTBUILD=" $SFLTDIR /build/Linux-ARM-VFPv2-GCC-OpenJDK"
1515# softfloat static library
1616SFLTLIB=" $SFLTBUILD /softfloat.a"
17+ # openjdk-build repo dir
18+ ABLDDIR=" $BUILDDIR /openjdk-build"
19+ # openjdk-build repo
20+ ABLDREPO=" https://github.com/AdoptOpenJDK/openjdk-build.git"
21+ # cacertfile
22+ CACERTFILE=" $ABLDDIR /security/cacerts"
1723
1824# #
1925# # Version-specific configuration
Original file line number Diff line number Diff line change @@ -51,3 +51,10 @@ if [ ! -d "$SFLTDIR" ] && [ "$SFLT_NEEDED" == "true" ]; then
5151 echo " [FETCH] Cloning SoftFloat repo"
5252 git clone --depth 1 " $SFLTREPO " " $SFLTDIR "
5353fi
54+
55+
56+ if [ ! -d " $ABLDDIR " ]; then
57+ # clone the root project
58+ echo " [FETCH] Cloning openjdk-build repo"
59+ git clone --depth 1 " $ABLDREPO " " $ABLDDIR "
60+ fi
You can’t perform that action at this time.
0 commit comments