Debian: Refresh patches after jbigi/jcpuid build script changes

This commit is contained in:
zzz
2016-04-29 15:30:55 +00:00
parent fbeca5ed80
commit c2e486f72c
2 changed files with 15 additions and 13 deletions

View File

@@ -10,18 +10,18 @@ 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
@@ -104,12 +104,8 @@
exit 1
fi
- LINKFLAGS="-shared -Wl,-soname,libjcpuid-${ARCH}-${UNIXTYPE}.so"
- LDFLAGS="${LDFLAGS} -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"
+ LDFLAGS="${LDFLAGS} -shared -Wl,-soname,libjcpuid.so"
+ LIBFILE="../jbigi/libjcpuid.so"
COMPILEFLAGS="-fPIC -Wall"
CFLAGS="${CFLAGS} -fPIC -Wall"
INCLUDES="-I. -Iinclude -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${UNIXTYPE}";;
esac