Changeset b62b668


Ignore:
Timestamp:
Sep 27, 2011 5:53:25 PM (9 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
0406b52
Parents:
40d3aa9
Message:

Debian: rework j(cpuid|bigi) patches

Patch reworking needed due to my recent edits to the jcpuid/jbigi scripts

Location:
debian/patches
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • debian/patches/0002-jbigi-soname.patch

    r40d3aa9 rb62b668  
    1313--- a/core/c/jbigi/mbuild_jbigi.sh
    1414+++ b/core/c/jbigi/mbuild_jbigi.sh
    15 @@ -47,7 +47,7 @@
     15@@ -48,7 +48,7 @@
    1616                fi
    1717         fi
     
    2222         LIBFILE="libjbigi.so";;
    2323 *)
    24 @@ -66,7 +66,7 @@
     24@@ -67,7 +67,7 @@
    2525 
    2626 echo "Compiling C code..."
  • debian/patches/0003-renaming-jcpuid.patch

    r40d3aa9 rb62b668  
    99--- a/core/c/jcpuid/build.sh
    1010+++ b/core/c/jcpuid/build.sh
    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 @@
    21  *kFreeBSD*|Linux*)
    22         COMPILEFLAGS="-fPIC -Wall"
    23         INCLUDES="-I. -Iinclude -I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
    24 -       LINKFLAGS="-shared -Wl,-soname,libjcpuid-x86-linux.so"
    25 -       LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-x86-linux.so";;
    26 +       LINKFLAGS="-shared -Wl,-soname,libjcpuid.so"
    27 +       LIBFILE="../jbigi/libjcpuid.so";;
     11@@ -83,8 +83,8 @@
     12             echo "and/or set JAVA_HOME then re-run this script."
     13             exit 1
     14         fi
     15-        LINKFLAGS="-shared -Wl,-soname,libjcpuid-${ARCH}-${UNIXTYPE}.so"
     16-        LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-${ARCH}-${UNIXTYPE}.so"
     17+        LINKFLAGS="-shared -Wl,-soname,libjcpuid.so"
     18+        LIBFILE="../jbigi/libjcpuid.so"
     19         COMPILEFLAGS="-fPIC -Wall"
     20         INCLUDES="-I. -Iinclude -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${UNIXTYPE}";;
    2821 esac
    29  
    30  echo "Compiling C code..."
Note: See TracChangeset for help on using the changeset viewer.