Changeset c24ddf5

Timestamp:

Oct 22, 2016 12:58:50 PM (4 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

35642e2

Parents:

f436fd0

Message:

Build: Fix jbigi build for Arch Linux and others when using Java 8 (ticket #1863)

File:

• core/c/find-java-home (modified) (6 diffs)

core/c/find-java-home

@@ -1 +1 @@
 UNIXTYPE=$(uname -s | tr "[A-Z]" "[a-z]")
 if [ $UNIXTYPE = "freebsd" ]; then
-    if [ -d /usr/local/openjdk6 ]; then
-        JAVA_HOME="/usr/local/openjdk6"
+    if [ -d /usr/local/openjdk8 ]; then
+        JAVA_HOME="/usr/local/openjdk8"
     elif [ -d /usr/local/openjdk7 ]; then
         JAVA_HOME="/usr/local/openjdk7"
+    elif [ -d /usr/local/openjdk6 ]; then
+        JAVA_HOME="/usr/local/openjdk6"
     fi
 elif [ $UNIXTYPE = "sunos" ]; then
@@ -10 +12 @@
     if [ -d /usr/jdk/latest/ ]; then
         JAVA_HOME="/usr/jdk/latest"
+    elif [ -d /usr/jdk/instances/jdk1.8.0/ ]; then
+        JAVA_HOME="/usr/jdk/instances/jdk1.8.0"
     elif [ -d /usr/jdk/instances/jdk1.7.0/ ]; then
         JAVA_HOME="/usr/jdk/instances/jdk1.7.0"
@@ -16 +20 @@
     fi
 elif [ $UNIXTYPE = "openbsd" ]; then
-    if [ -d /usr/local/jdk-1.7.0 ]; then
+    if [ -d /usr/local/jdk-1.8.0 ]; then
+        JAVA_HOME="/usr/local/jdk-1.8.0"
+    elif [ -d /usr/local/jdk-1.7.0 ]; then
         JAVA_HOME="/usr/local/jdk-1.7.0"
     elif [ -d /usr/local/jdk-1.6.0 ]; then
@@ -22 +28 @@
     fi
 elif [ $UNIXTYPE = "netbsd" ]; then
-    if [ -d /usr/pkg/java/openjdk7 ]; then
+    if [ -d /usr/pkg/java/openjdk8 ]; then
+        JAVA_HOME="/usr/pkg/java/openjdk8"
+    elif [ -d /usr/pkg/java/openjdk7 ]; then
         JAVA_HOME="/usr/pkg/java/openjdk7"
     fi
@@ -30 +38 @@
     fi
 elif [ $UNIXTYPE = "linux" ] && [ -e /etc/arch-release ]; then
-    if [ -d /usr/lib/jvm/java-7-openjdk ]; then
+    if [ -d /usr/lib/jvm/java-8-openjdk ]; then
+        JAVA_HOME="/usr/lib/jvm/java-8-openjdk"
+    elif [ -d /usr/lib/jvm/java-7-openjdk ]; then
         JAVA_HOME="/usr/lib/jvm/java-7-openjdk"
     elif [ -d /usr/lib/jvm/java-6-openjdk ]; then
@@ -42 +52 @@
     UNIXTYPE="linux"
     # OpenJDK 7 is supported as of Debian Jessie
-    if [ -d /usr/lib/jvm/java-7-openjdk-kfreebsd-amd64/ ]; then
+    if [ -d /usr/lib/jvm/java-8-openjdk-kfreebsd-amd64/ ]; then
+        JAVA_HOME="/usr/lib/jvm/java-8-openjdk-kfreebsd-amd64"
+    elif [ -d /usr/lib/jvm/java-8-openjdk-kfreebsd-i386/ ]; then
+        JAVA_HOME="/usr/lib/jvm/java-8-openjdk-kfreebsd-i386"
+    elif [ -d /usr/lib/jvm/java-7-openjdk-kfreebsd-amd64/ ]; then
         JAVA_HOME="/usr/lib/jvm/java-7-openjdk-kfreebsd-amd64"
     elif [ -d /usr/lib/jvm/java-7-openjdk-kfreebsd-i386/ ]; then