From 543e0b0d65b71623af2f71eb1f136ad08cda1ea9 Mon Sep 17 00:00:00 2001 From: kytv Date: Tue, 26 Jul 2011 23:28:25 +0000 Subject: [PATCH] Debian: Minor changes so the jbigi-jni package can be built on non-x86 systems. --- debian/libjbigi-jni.install | 2 +- debian/patches/0003-renaming-jcpuid.patch | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/libjbigi-jni.install b/debian/libjbigi-jni.install index c56cc123ad..3098c02615 100644 --- a/debian/libjbigi-jni.install +++ b/debian/libjbigi-jni.install @@ -1,2 +1,2 @@ core/c/jbigi/*.so usr/lib/jni -core/c/jcpuid/lib/freenet/support/CPUInformation/*.so usr/lib/jni +#core/c/jcpuid/lib/freenet/support/CPUInformation/*.so usr/lib/jni diff --git a/debian/patches/0003-renaming-jcpuid.patch b/debian/patches/0003-renaming-jcpuid.patch index 5ddb2f4cc1..9053c14c97 100644 --- a/debian/patches/0003-renaming-jcpuid.patch +++ b/debian/patches/0003-renaming-jcpuid.patch @@ -3,8 +3,8 @@ Date: Tue, 24 May 2011 21:26:10 +0000 Subject: rename jcpuid --- - core/c/jcpuid/build.sh | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + core/c/jcpuid/build.sh | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) --- a/core/c/jcpuid/build.sh +++ b/core/c/jcpuid/build.sh @@ -24,7 +24,7 @@ Subject: rename jcpuid - LINKFLAGS="-shared -Wl,-soname,libjcpuid-x86-linux.so" - LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-x86-linux.so";; + LINKFLAGS="-shared -Wl,-soname,libjcpuid.so" -+ LIBFILE="lib/freenet/support/CPUInformation/libjcpuid.so";; ++ LIBFILE="../jbigi/libjcpuid.so";; esac echo "Compiling C code..."