forked from I2P_Developers/i2p.i2p
Debian: Updates from the 0.9.24 release, including patch refresh, not checked in at the time.
Cherry-picked out of https://launchpad.net/~i2p.packages/+archive/ubuntu/i2p/+files/i2p_0.9.24-1ubuntu1.debian.tar.xz The files in http://deb.i2p2.no/pool/main/i/i2p/i2p_0.9.24-1~deb8u+1.debian.tar.xz are somewhat different. Note that some files out of that tarball are apparently older than what is in our debian/ directory and were not copied over. Some of the changes may be for Ubuntu and will not work for Debian. Kytv may have had a local debian/ directory for Ubuntu builds that was not checked in anywhere. Untested. Another patch refresh for 0.9.25 may be required. To be fixed up after the 0.9.25 release.
This commit is contained in:
27
debian/patches/0003-rename-jcpuid.patch
vendored
Normal file
27
debian/patches/0003-rename-jcpuid.patch
vendored
Normal file
@ -0,0 +1,27 @@
|
||||
From: Kill Your TV <killyourtv@i2pmail.org>
|
||||
Date: Tue, 24 May 2011 21:26:10 +0000
|
||||
Subject: rename jcpuid
|
||||
|
||||
---
|
||||
core/c/jcpuid/build.sh | 8 ++------
|
||||
1 file changed, 2 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/core/c/jcpuid/build.sh b/core/c/jcpuid/build.sh
|
||||
index 5b63c6c..f39148d 100755
|
||||
--- a/core/c/jcpuid/build.sh
|
||||
+++ b/core/c/jcpuid/build.sh
|
||||
@@ -75,12 +75,8 @@ case `uname -s` in
|
||||
exit 0;;
|
||||
esac
|
||||
|
||||
- LINKFLAGS="-shared -Wl,-soname,libjcpuid-${ARCH}-${UNIXTYPE}.so"
|
||||
- if [ $KFREEBSD -eq 1 ]; then
|
||||
- LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-${ARCH}-kfreebsd.so"
|
||||
- else
|
||||
- LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-${ARCH}-${UNIXTYPE}.so"
|
||||
- fi
|
||||
+ 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
|
Reference in New Issue
Block a user