Update patches, packages & paths for JDK10

ev3dev-lang-java · Mar 25, 2018 · aabc7f8 · aabc7f8
1 parent 5b82756
commit aabc7f8
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/build/Dockerfile.system b/build/Dockerfile.system
@@ -26,6 +26,7 @@ RUN dpkg --add-architecture armel && \
         xz-utils \
         libcups2-dev:armel \
         libfreetype6-dev:armel \
+        libfontconfig1-dev:armel \
         libasound2-dev:armel \
         libx11-dev:armel \
         libxext-dev:armel \

diff --git a/build/build.sh b/build/build.sh
@@ -7,7 +7,7 @@ source config.sh
 cd "$JDKDIR"
 
 # refresh patched build system
-bash ./common/autoconf/autogen.sh
+bash ./make/autoconf/autogen.sh
 
 ## Description ##
 # 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" \
                  --with-freetype-include=/usr/include \
                  --with-jvm-variants=client \
                  --with-extra-cflags="-w -Wno-error -D__SOFTFP__" \
+                 --with-extra-cxxflags="-w -Wno-error -D__SOFTFP__" \
                  --with-version-string="$JAVA_VERSION" \
                  AR="arm-linux-gnueabi-gcc-ar" \
                  NM="arm-linux-gnueabi-gcc-nm" \

diff --git a/build/ev3.patch b/build/ev3.patch
@@ -1,6 +1,6 @@
-diff -r a08cbfc0e4ec common/autoconf/flags.m4
---- a/common/autoconf/flags.m4	Thu Aug 03 18:56:56 2017 +0000
-+++ b/common/autoconf/flags.m4	Wed Dec 27 00:52:44 2017 +0100
+diff -r a08cbfc0e4ec make/autoconf/flags.m4
+--- a/make/autoconf/flags.m4	Thu Aug 03 18:56:56 2017 +0000
++++ b/make/autoconf/flags.m4	Wed Dec 27 00:52:44 2017 +0100
 @@ -30,7 +30,7 @@
  AC_DEFUN([FLAGS_SETUP_ABI_PROFILE],
  [

diff --git a/build/fetch.sh b/build/fetch.sh
@@ -9,11 +9,10 @@ hg clone "$JAVA_REPO" "$JDKDIR"
 
 # clone the rest of the tree
 cd "$JDKDIR"
-bash ./get_source.sh
 
 # apply the EV3-specific patches
 #  - build flags for arm926ej-s
-patch -p1            < "$SCRIPTDIR/ev3.patch"
+patch -p1 < "$SCRIPTDIR/ev3.patch"
 #  - use the system-provided floating point implementation
-patch -p1 -d hotspot < "$SCRIPTDIR/float.patch"
+patch -p1 < "$SCRIPTDIR/float.patch"
 
diff --git a/build/float.patch b/build/float.patch
@@ -1,6 +1,6 @@
-diff -r b756e7a2ec33 src/cpu/arm/vm/assembler_arm_32.hpp
---- a/src/cpu/arm/vm/assembler_arm_32.hpp	Thu Aug 03 18:56:57 2017 +0000
-+++ b/src/cpu/arm/vm/assembler_arm_32.hpp	Wed Dec 27 01:08:37 2017 +0100
+diff -r b756e7a2ec33 src/hotspot/cpu/arm/assembler_arm_32.hpp
+--- a/src/hotspot/cpu/arm/assembler_arm_32.hpp	Thu Aug 03 18:56:57 2017 +0000
++++ b/src/hotspot/cpu/arm/assembler_arm_32.hpp	Wed Dec 27 01:08:37 2017 +0100
 @@ -1234,10 +1234,17 @@
 
  // Imported code from glibc soft-fp bundle for