Changeset 5e90780 for core/c


Ignore:
Timestamp:
Sep 11, 2013 2:04:58 PM (7 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
79891c6
Parents:
23444e4
Message:

jbigi/jcpuid build scripts: Look for OpenJDK7 in kFreeBSD (it has landed in Debian testing)

File:
1 edited

Legend:

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

    r23444e4 r5e90780  
    3636    JAVA_HOME=$(/usr/libexec/java_home)
    3737elif [ $UNIXTYPE = "gnu/kfreebsd" ]; then
     38    # Even though the kernel is FreeBSD's, the userland is GNU.
     39    # kFreeBSD has $JAVA_HOME/include/linux instead of $JAVA_HOME/include/*bsd
    3840    UNIXTYPE="linux"
    39     if [ -d /usr/lib/jvm/java-gcj ]; then
     41    # OpenJDK 7 is supported as of Debian Jessie
     42    if [ -d /usr/lib/jvm/java-7-openjdk-kfreebsd-amd64/ ]; then
     43        JAVA_HOME="/usr/lib/jvm/java-7-openjdk-kfreebsd-amd64"
     44    elif [ -d /usr/lib/jvm/java-7-openjdk-kfreebsd-i386/ ]; then
     45        JAVA_HOME="/usr/lib/jvm/java-7-openjdk-kfreebsd-i386"
     46    elif [ -d /usr/lib/jvm/java-gcj ]; then
    4047        JAVA_HOME="/usr/lib/jvm/java-gcj"
    4148    fi
Note: See TracChangeset for help on using the changeset viewer.