Skip to content

Commit aabc7f8

Browse files
committed
Update patches, packages & paths for JDK10
1 parent 5b82756 commit aabc7f8

File tree

5 files changed

+11
-10
lines changed

5 files changed

+11
-10
lines changed

build/Dockerfile.system

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ RUN dpkg --add-architecture armel && \
2626
xz-utils \
2727
libcups2-dev:armel \
2828
libfreetype6-dev:armel \
29+
libfontconfig1-dev:armel \
2930
libasound2-dev:armel \
3031
libx11-dev:armel \
3132
libxext-dev:armel \

build/build.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ source config.sh
77
cd "$JDKDIR"
88

99
# refresh patched build system
10-
bash ./common/autoconf/autogen.sh
10+
bash ./make/autoconf/autogen.sh
1111

1212
## Description ##
1313
# Use the downloaded JDK: --with-boot-jdk=/opt/jdkcross/jdk-9.0.1
@@ -35,6 +35,7 @@ bash ./configure --with-boot-jdk="$SCRIPTDIR/jdk-10" \
3535
--with-freetype-include=/usr/include \
3636
--with-jvm-variants=client \
3737
--with-extra-cflags="-w -Wno-error -D__SOFTFP__" \
38+
--with-extra-cxxflags="-w -Wno-error -D__SOFTFP__" \
3839
--with-version-string="$JAVA_VERSION" \
3940
AR="arm-linux-gnueabi-gcc-ar" \
4041
NM="arm-linux-gnueabi-gcc-nm" \

build/ev3.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
diff -r a08cbfc0e4ec common/autoconf/flags.m4
2-
--- a/common/autoconf/flags.m4 Thu Aug 03 18:56:56 2017 +0000
3-
+++ b/common/autoconf/flags.m4 Wed Dec 27 00:52:44 2017 +0100
1+
diff -r a08cbfc0e4ec make/autoconf/flags.m4
2+
--- a/make/autoconf/flags.m4 Thu Aug 03 18:56:56 2017 +0000
3+
+++ b/make/autoconf/flags.m4 Wed Dec 27 00:52:44 2017 +0100
44
@@ -30,7 +30,7 @@
55
AC_DEFUN([FLAGS_SETUP_ABI_PROFILE],
66
[

build/fetch.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,10 @@ hg clone "$JAVA_REPO" "$JDKDIR"
99

1010
# clone the rest of the tree
1111
cd "$JDKDIR"
12-
bash ./get_source.sh
1312

1413
# apply the EV3-specific patches
1514
# - build flags for arm926ej-s
16-
patch -p1 < "$SCRIPTDIR/ev3.patch"
15+
patch -p1 < "$SCRIPTDIR/ev3.patch"
1716
# - use the system-provided floating point implementation
18-
patch -p1 -d hotspot < "$SCRIPTDIR/float.patch"
17+
patch -p1 < "$SCRIPTDIR/float.patch"
1918

build/float.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
diff -r b756e7a2ec33 src/cpu/arm/vm/assembler_arm_32.hpp
2-
--- a/src/cpu/arm/vm/assembler_arm_32.hpp Thu Aug 03 18:56:57 2017 +0000
3-
+++ b/src/cpu/arm/vm/assembler_arm_32.hpp Wed Dec 27 01:08:37 2017 +0100
1+
diff -r b756e7a2ec33 src/hotspot/cpu/arm/assembler_arm_32.hpp
2+
--- a/src/hotspot/cpu/arm/assembler_arm_32.hpp Thu Aug 03 18:56:57 2017 +0000
3+
+++ b/src/hotspot/cpu/arm/assembler_arm_32.hpp Wed Dec 27 01:08:37 2017 +0100
44
@@ -1234,10 +1234,17 @@
55

66
// Imported code from glibc soft-fp bundle for

0 commit comments

Comments
 (0)