Changeset 527c9ba5

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:

• c/jbigi/mbuild_jbigi.sh (modified) (1 diff)
• c/jcpuid/build.sh (modified) (2 diffs)
• java/src/freenet/support/CPUInformation/CPUID.java (modified) (3 diffs)

core/c/jbigi/mbuild_jbigi.sh

@@ -24 +24 @@
         LINKFLAGS="-dynamiclib -framework JavaVM"
         LIBFILE="libjbigi.jnilib";;
+SunOS*)
+        COMPILEFLAGS="-fPIC -Wall"
+        INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/solaris"
+        LINKFLAGS="-shared -Wl,-soname,libjbigi.so"
+        LIBFILE="libjbigi.so";;
+
 *)
         COMPILEFLAGS="-fPIC -Wall"

core/c/jcpuid/build.sh

@@ -4 +4 @@
 MINGW*)
         echo "Building windows .dll's";;
+SunOS*)
+        echo "Building solaris .so's";;
 CYGWIN*)
         echo "Building windows .dll's";;
@@ -32 +34 @@
         LINKFLAGS="-shared -static -static-libgcc -Wl,--kill-at"
         LIBFILE="lib/freenet/support/CPUInformation/jcpuid-x86-windows.dll";;
+SunOS*)
+        COMPILEFLAGS="-Wall"
+        INCLUDES="-I. -Iinclude -I$JAVA_HOME/include/ -I$JAVA_HOME/include/solaris/"
+        LINKFLAGS="-shared -static -Wl,-soname,libjcpuid-x86-solaris.so"
+        LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-x86-solaris.so";;
 FreeBSD*)
         COMPILEFLAGS="-Wall"

core/java/src/freenet/support/CPUInformation/CPUID.java

@@ -53 +53 @@
     private static final boolean isLinux = System.getProperty("os.name").toLowerCase().contains("linux");
     private static final boolean isFreebsd = System.getProperty("os.name").toLowerCase().contains("freebsd");
+    private static final boolean isSunos = System.getProperty("os.name").toLowerCase().contains("sunos");
     
     /**
@@ -720 +721 @@
         if(isFreebsd)
             return "jcpuid-x86-freebsd"; // The convention on freebsd...
+        if(isSunos)
+            return "jcpuid-x86-solaris"; // The convention on SunOS
         //throw new RuntimeException("Dont know jcpuid library name for os type '"+System.getProperty("os.name")+"'");
         // use linux as the default, don't throw exception
@@ -731 +734 @@
         if(isFreebsd)
             return "jcpuid-x86_64-freebsd";
+        if(isSunos)
+            return "jcpuid-x86_64-solaris";
         // use linux as the default, don't throw exception
         return "jcpuid-x86_64-linux";