File tree Expand file tree Collapse file tree 5 files changed +11
-10
lines changed Expand file tree Collapse file tree 5 files changed +11
-10
lines changed Original file line number Diff line number Diff line change @@ -26,6 +26,7 @@ RUN dpkg --add-architecture armel && \
26
26
xz-utils \
27
27
libcups2-dev:armel \
28
28
libfreetype6-dev:armel \
29
+ libfontconfig1-dev:armel \
29
30
libasound2-dev:armel \
30
31
libx11-dev:armel \
31
32
libxext-dev:armel \
Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ source config.sh
7
7
cd " $JDKDIR "
8
8
9
9
# refresh patched build system
10
- bash ./common /autoconf/autogen.sh
10
+ bash ./make /autoconf/autogen.sh
11
11
12
12
# # Description ##
13
13
# 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" \
35
35
--with-freetype-include=/usr/include \
36
36
--with-jvm-variants=client \
37
37
--with-extra-cflags=" -w -Wno-error -D__SOFTFP__" \
38
+ --with-extra-cxxflags=" -w -Wno-error -D__SOFTFP__" \
38
39
--with-version-string=" $JAVA_VERSION " \
39
40
AR=" arm-linux-gnueabi-gcc-ar" \
40
41
NM=" arm-linux-gnueabi-gcc-nm" \
Original file line number Diff line number Diff line change 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
4
4
@@ -30,7 +30,7 @@
5
5
AC_DEFUN([FLAGS_SETUP_ABI_PROFILE],
6
6
[
Original file line number Diff line number Diff line change @@ -9,11 +9,10 @@ hg clone "$JAVA_REPO" "$JDKDIR"
9
9
10
10
# clone the rest of the tree
11
11
cd " $JDKDIR "
12
- bash ./get_source.sh
13
12
14
13
# apply the EV3-specific patches
15
14
# - build flags for arm926ej-s
16
- patch -p1 < " $SCRIPTDIR /ev3.patch"
15
+ patch -p1 < " $SCRIPTDIR /ev3.patch"
17
16
# - use the system-provided floating point implementation
18
- patch -p1 -d hotspot < " $SCRIPTDIR /float.patch"
17
+ patch -p1 < " $SCRIPTDIR /float.patch"
19
18
Original file line number Diff line number Diff line change 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
4
4
@@ -1234,10 +1234,17 @@
5
5
6
6
// Imported code from glibc soft-fp bundle for
You can’t perform that action at this time.
0 commit comments