Changeset 43ba271 for debian


Ignore:
Timestamp:
May 31, 2011 11:32:07 AM (9 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
4ecacc7
Parents:
527c9ba5
Message:

Debian: Refactor jcpuid & jbigi patches to deal with SunOS support

Location:
debian/patches
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • debian/patches/0004-Update-path-of-jbigi-and-add-soname.patch

    r527c9ba5 r43ba271  
    77 1 files changed, 3 insertions(+), 3 deletions(-)
    88
    9 diff --git a/core/c/jbigi/mbuild_jbigi.sh b/core/c/jbigi/mbuild_jbigi.sh
    10 index 1e262a6..7581335 100755
    119--- a/core/c/jbigi/mbuild_jbigi.sh
    1210+++ b/core/c/jbigi/mbuild_jbigi.sh
    13 @@ -25,8 +25,8 @@ Darwin*)
     11@@ -25,14 +25,14 @@
    1412         LIBFILE="libjbigi.jnilib";;
     13 SunOS*)
     14         COMPILEFLAGS="-fPIC -Wall"
     15-        INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/solaris"
     16-        LINKFLAGS="-shared -Wl,-soname,libjbigi.so"
     17+        INCLUDES="-I. -I./jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/solaris"
     18+        LINKFLAGS="-shared -Wl,-soname,libjbigi.so.0"
     19         LIBFILE="libjbigi.so";;
     20 
    1521 *)
    1622        COMPILEFLAGS="-fPIC -Wall"
     
    2228 esac
    2329 
    24 @@ -41,7 +41,7 @@ fi
     30@@ -47,7 +47,7 @@
    2531 
    2632 echo "Compiling C code..."
     
    3137 
    3238 exit 0
    33 --
  • debian/patches/0007-rename-jcpuid.patch

    r527c9ba5 r43ba271  
    99--- a/core/c/jcpuid/build.sh
    1010+++ b/core/c/jcpuid/build.sh
    11 @@ -39,8 +39,8 @@
     11@@ -37,7 +37,7 @@
     12         COMPILEFLAGS="-Wall"
     13         INCLUDES="-I. -Iinclude -I$JAVA_HOME/include/ -I$JAVA_HOME/include/solaris/"
     14         LINKFLAGS="-shared -static -Wl,-soname,libjcpuid-x86-solaris.so"
     15-        LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-x86-solaris.so";;
     16+        LIBFILE="lib/freenet/support/CPUInformation/libjcpuid.so";;
     17 FreeBSD*)
     18        COMPILEFLAGS="-Wall"
     19        INCLUDES="-I. -Iinclude -I$JAVA_HOME/include/ -I$JAVA_HOME/include/freebsd/"
     20@@ -46,8 +46,8 @@
    1221 *kFreeBSD*|Linux*)
    1322        COMPILEFLAGS="-fPIC -Wall"
Note: See TracChangeset for help on using the changeset viewer.