zzz/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Debian: rework j(cpuid|bigi) patches

Browse Source 
Patch reworking needed due to my recent edits to the jcpuid/jbigi scripts
This commit is contained in:
kytv
2011-09-27 17:53:25 +00:00
parent 40d3aa9d4c
commit b62b668d1a
2 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
debian/patches/0002-jbigi-soname.patch vendored
View File

@@ -12,7 +12,7 @@ a soname to shut lintian up.
--- a/core/c/jbigi/mbuild_jbigi.sh --- a/core/c/jbigi/mbuild_jbigi.sh
+++ b/core/c/jbigi/mbuild_jbigi.sh +++ b/core/c/jbigi/mbuild_jbigi.sh
@@ -47,7 +47,7 @@ @@ -48,7 +48,7 @@
fi fi
fi fi
COMPILEFLAGS="-fPIC -Wall" COMPILEFLAGS="-fPIC -Wall"
@@ -21,7 +21,7 @@ a soname to shut lintian up.
LINKFLAGS="-shared -Wl,-soname,libjbigi.so" LINKFLAGS="-shared -Wl,-soname,libjbigi.so"
LIBFILE="libjbigi.so";; LIBFILE="libjbigi.so";;
*) *)
@@ -66,7 +66,7 @@ @@ -67,7 +67,7 @@
echo "Compiling C code..." echo "Compiling C code..."
rm -f jbigi.o $LIBFILE rm -f jbigi.o $LIBFILE

27
debian/patches/0003-renaming-jcpuid.patch vendored
View File

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