Changeset b62b668

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:

• 0002-jbigi-soname.patch (modified) (2 diffs)
• 0003-renaming-jcpuid.patch (modified) (1 diff)

debian/patches/0002-jbigi-soname.patch

@@ -13 +13 @@
 --- a/core/c/jbigi/mbuild_jbigi.sh
 +++ b/core/c/jbigi/mbuild_jbigi.sh
-@@ -47,7 +47,7 @@
+@@ -48,7 +48,7 @@
                 fi
          fi
@@ -22 +22 @@
          LIBFILE="libjbigi.so";;
  *)
-@@ -66,7 +66,7 @@
+@@ -67,7 +67,7 @@
  
  echo "Compiling C code..."

debian/patches/0003-renaming-jcpuid.patch

@@ -9 +9 @@
 --- a/core/c/jcpuid/build.sh
 +++ b/core/c/jcpuid/build.sh
-@@ -37,7 +37,7 @@
-         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";;
-+        LIBFILE="lib/freenet/support/CPUInformation/libjcpuid.so";;
- FreeBSD*)
-        COMPILEFLAGS="-Wall"
-        INCLUDES="-I. -Iinclude -I$JAVA_HOME/include/ -I$JAVA_HOME/include/freebsd/"
-@@ -46,8 +46,8 @@
- *kFreeBSD*|Linux*)
-        COMPILEFLAGS="-fPIC -Wall"
-        INCLUDES="-I. -Iinclude -I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
--       LINKFLAGS="-shared -Wl,-soname,libjcpuid-x86-linux.so"
--       LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-x86-linux.so";;
-+       LINKFLAGS="-shared -Wl,-soname,libjcpuid.so"
-+       LIBFILE="../jbigi/libjcpuid.so";;
+@@ -83,8 +83,8 @@
+             echo "and/or set JAVA_HOME then re-run this script."
+             exit 1
+         fi
+-        LINKFLAGS="-shared -Wl,-soname,libjcpuid-${ARCH}-${UNIXTYPE}.so"
+-        LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-${ARCH}-${UNIXTYPE}.so"
++        LINKFLAGS="-shared -Wl,-soname,libjcpuid.so"
++        LIBFILE="../jbigi/libjcpuid.so"
+         COMPILEFLAGS="-fPIC -Wall"
+         INCLUDES="-I. -Iinclude -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${UNIXTYPE}";;
  esac
- 
- echo "Compiling C code..."