Changeset c24ddf5


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • core/c/find-java-home

    rf436fd0 rc24ddf5  
    11UNIXTYPE=$(uname -s | tr "[A-Z]" "[a-z]")
    22if [ $UNIXTYPE = "freebsd" ]; then
    3     if [ -d /usr/local/openjdk6 ]; then
    4         JAVA_HOME="/usr/local/openjdk6"
     3    if [ -d /usr/local/openjdk8 ]; then
     4        JAVA_HOME="/usr/local/openjdk8"
    55    elif [ -d /usr/local/openjdk7 ]; then
    66        JAVA_HOME="/usr/local/openjdk7"
     7    elif [ -d /usr/local/openjdk6 ]; then
     8        JAVA_HOME="/usr/local/openjdk6"
    79    fi
    810elif [ $UNIXTYPE = "sunos" ]; then
     
    1012    if [ -d /usr/jdk/latest/ ]; then
    1113        JAVA_HOME="/usr/jdk/latest"
     14    elif [ -d /usr/jdk/instances/jdk1.8.0/ ]; then
     15        JAVA_HOME="/usr/jdk/instances/jdk1.8.0"
    1216    elif [ -d /usr/jdk/instances/jdk1.7.0/ ]; then
    1317        JAVA_HOME="/usr/jdk/instances/jdk1.7.0"
     
    1620    fi
    1721elif [ $UNIXTYPE = "openbsd" ]; then
    18     if [ -d /usr/local/jdk-1.7.0 ]; then
     22    if [ -d /usr/local/jdk-1.8.0 ]; then
     23        JAVA_HOME="/usr/local/jdk-1.8.0"
     24    elif [ -d /usr/local/jdk-1.7.0 ]; then
    1925        JAVA_HOME="/usr/local/jdk-1.7.0"
    2026    elif [ -d /usr/local/jdk-1.6.0 ]; then
     
    2228    fi
    2329elif [ $UNIXTYPE = "netbsd" ]; then
    24     if [ -d /usr/pkg/java/openjdk7 ]; then
     30    if [ -d /usr/pkg/java/openjdk8 ]; then
     31        JAVA_HOME="/usr/pkg/java/openjdk8"
     32    elif [ -d /usr/pkg/java/openjdk7 ]; then
    2533        JAVA_HOME="/usr/pkg/java/openjdk7"
    2634    fi
     
    3038    fi
    3139elif [ $UNIXTYPE = "linux" ] && [ -e /etc/arch-release ]; then
    32     if [ -d /usr/lib/jvm/java-7-openjdk ]; then
     40    if [ -d /usr/lib/jvm/java-8-openjdk ]; then
     41        JAVA_HOME="/usr/lib/jvm/java-8-openjdk"
     42    elif [ -d /usr/lib/jvm/java-7-openjdk ]; then
    3343        JAVA_HOME="/usr/lib/jvm/java-7-openjdk"
    3444    elif [ -d /usr/lib/jvm/java-6-openjdk ]; then
     
    4252    UNIXTYPE="linux"
    4353    # OpenJDK 7 is supported as of Debian Jessie
    44     if [ -d /usr/lib/jvm/java-7-openjdk-kfreebsd-amd64/ ]; then
     54    if [ -d /usr/lib/jvm/java-8-openjdk-kfreebsd-amd64/ ]; then
     55        JAVA_HOME="/usr/lib/jvm/java-8-openjdk-kfreebsd-amd64"
     56    elif [ -d /usr/lib/jvm/java-8-openjdk-kfreebsd-i386/ ]; then
     57        JAVA_HOME="/usr/lib/jvm/java-8-openjdk-kfreebsd-i386"
     58    elif [ -d /usr/lib/jvm/java-7-openjdk-kfreebsd-amd64/ ]; then
    4559        JAVA_HOME="/usr/lib/jvm/java-7-openjdk-kfreebsd-amd64"
    4660    elif [ -d /usr/lib/jvm/java-7-openjdk-kfreebsd-i386/ ]; then
Note: See TracChangeset for help on using the changeset viewer.