Changeset 527c9ba5


Ignore:
Timestamp:
May 31, 2011 11:30:10 AM (9 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
43ba271
Parents:
d4bf2523
Message:

Add support to jbigi/jcpuid for Solaris/SunOS

Location:
core
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • core/c/jbigi/mbuild_jbigi.sh

    rd4bf2523 r527c9ba5  
    2424        LINKFLAGS="-dynamiclib -framework JavaVM"
    2525        LIBFILE="libjbigi.jnilib";;
     26SunOS*)
     27        COMPILEFLAGS="-fPIC -Wall"
     28        INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/solaris"
     29        LINKFLAGS="-shared -Wl,-soname,libjbigi.so"
     30        LIBFILE="libjbigi.so";;
     31
    2632*)
    2733        COMPILEFLAGS="-fPIC -Wall"
  • core/c/jcpuid/build.sh

    rd4bf2523 r527c9ba5  
    44MINGW*)
    55        echo "Building windows .dll's";;
     6SunOS*)
     7        echo "Building solaris .so's";;
    68CYGWIN*)
    79        echo "Building windows .dll's";;
     
    3234        LINKFLAGS="-shared -static -static-libgcc -Wl,--kill-at"
    3335        LIBFILE="lib/freenet/support/CPUInformation/jcpuid-x86-windows.dll";;
     36SunOS*)
     37        COMPILEFLAGS="-Wall"
     38        INCLUDES="-I. -Iinclude -I$JAVA_HOME/include/ -I$JAVA_HOME/include/solaris/"
     39        LINKFLAGS="-shared -static -Wl,-soname,libjcpuid-x86-solaris.so"
     40        LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-x86-solaris.so";;
    3441FreeBSD*)
    3542        COMPILEFLAGS="-Wall"
  • core/java/src/freenet/support/CPUInformation/CPUID.java

    rd4bf2523 r527c9ba5  
    5353    private static final boolean isLinux = System.getProperty("os.name").toLowerCase().contains("linux");
    5454    private static final boolean isFreebsd = System.getProperty("os.name").toLowerCase().contains("freebsd");
     55    private static final boolean isSunos = System.getProperty("os.name").toLowerCase().contains("sunos");
    5556   
    5657    /**
     
    720721        if(isFreebsd)
    721722            return "jcpuid-x86-freebsd"; // The convention on freebsd...
     723        if(isSunos)
     724            return "jcpuid-x86-solaris"; // The convention on SunOS
    722725        //throw new RuntimeException("Dont know jcpuid library name for os type '"+System.getProperty("os.name")+"'");
    723726        // use linux as the default, don't throw exception
     
    731734        if(isFreebsd)
    732735            return "jcpuid-x86_64-freebsd";
     736        if(isSunos)
     737            return "jcpuid-x86_64-solaris";
    733738        // use linux as the default, don't throw exception
    734739        return "jcpuid-x86_64-linux";
Note: See TracChangeset for help on using the changeset viewer.