From: "C. Huhn" <spo...@knollhuhn.de> Tags: patch
Hi, this patch adds support for Oracle Java 8 preview on armhf. The generated package works on my box (only tested 'java -version' yet though). Setting the j2se_arch to "arm-vfp-hflt" is rather ugly, but that seems to be the prefered upstream naming. Cheers, Christopher --- lib/jdk.sh | 2 +- lib/oracle-jdk.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/jdk.sh b/lib/jdk.sh index 7ae61f0..de058ab 100644 --- a/lib/jdk.sh +++ b/lib/jdk.sh @@ -6,7 +6,7 @@ j2sdk_control() { if [ "${DEB_BUILD_ARCH:0:3}" = "arm" ]; then # ARM is only softfloat ATM so if building on armhf # force the dependencies to pickup cross platform fu - if [ "${DEB_BUILD_ARCH}" == "armhf" ]; then + if [ "${DEB_BUILD_ARCH}" == "armhf" -a "${j2se_arch}" != "arm-vfp-hflt" ]; then depends="libc6-armel, libsfgcc1, libsfstdc++6" fi # No browser on ARM yet diff --git a/lib/oracle-jdk.sh b/lib/oracle-jdk.sh index 18a84ed..4dcb276 100644 --- a/lib/oracle-jdk.sh +++ b/lib/oracle-jdk.sh @@ -20,12 +20,12 @@ oracle_j2sdk_detect() { fi # Early Access Release (jdk-8-ea-bin-b103-linux-i586-15_aug_2013.tar.gz) - if [[ $archive_name =~ jdk-([0-9]+)(u([0-9]+))?-(ea|fcs)-bin-(b[0-9]+)-linux-(i586|x64|amd64).*\.(bin|tar\.gz) ]] + if [[ $archive_name =~ jdk-([0-9]+)(u([0-9]+))?-(ea|fcs)-(bin-)?(b[0-9]+)-linux-(i586|x64|amd64|arm-vfp-hflt).*\.(bin|tar\.gz) ]] then j2se_release=${BASH_REMATCH[1]} j2se_update=${BASH_REMATCH[3]} - j2se_build=${BASH_REMATCH[5]} - j2se_arch=${BASH_REMATCH[6]} + j2se_build=${BASH_REMATCH[6]} + j2se_arch=${BASH_REMATCH[7]} if [[ $j2se_update != "" ]] then j2se_version_name="$j2se_release Update $j2se_update Early Access Release Build $j2se_build" -- 1.7.10.4 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org