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

Debian: Fix builds for x32 (ticket #2076)

Browse Source 
Incorporate patches 2 and 3 into build scripts
This commit is contained in:
zzz
2017-11-19 16:58:51 +00:00
parent 3ba46f16d1
commit 3abc777062
7 changed files with 63 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
core/c/jbigi/build_jbigi.sh
View File

@@ -68,7 +68,13 @@ sunos*|openbsd*|netbsd*|*freebsd*|linux*)
BUILD_OS="linux"
fi
COMPILEFLAGS="-fPIC -Wall $CFLAGS"
INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/$BUILD_OS -I/usr/local/include"
# change the path that build_jbigi.sh expects to find the source files at.
# formerly 0002-jbigi-soname.patch
if [ "$DEBIANVERSION" ] ; then
INCLUDES="-I. -I./jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/$BUILD_OS -I/usr/local/include"
else
INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/$BUILD_OS -I/usr/local/include"
fi
LINKFLAGS="-shared -Wl,-soname,libjbigi.so"
LIBFILE="libjbigi.so";;
*)
@@ -85,12 +91,23 @@ else
STATICLIBS=".libs/libgmp.a"
fi
[ $BITS -eq 32 -a "${UNAME#*86}" != "$UNAME" ] && COMPILEFLAGS="-m32 $COMPILEFLAGS" && LINKFLAGS="-m32 $LINKFLAGS"
[ $BITS -eq 64 -a "${UNAME#*86}" != "$UNAME" ] && COMPILEFLAGS="-m64 $COMPILEFLAGS" && LINKFLAGS="-m64 $LINKFLAGS"
# Debian builds are presumed to be native, we don't need the -mxx flag unless cross-compile,
# and this breaks the x32 build
if [ -z "$DEBIANVERSION" ] ; then
[ $BITS -eq 32 -a "${UNAME#*86}" != "$UNAME" ] && COMPILEFLAGS="-m32 $COMPILEFLAGS" && LINKFLAGS="-m32 $LINKFLAGS"
[ $BITS -eq 64 -a "${UNAME#*86}" != "$UNAME" ] && COMPILEFLAGS="-m64 $COMPILEFLAGS" && LINKFLAGS="-m64 $LINKFLAGS"
fi
echo "Compiling C code..."
echo "Compile: \"$CC -c $COMPILEFLAGS $INCLUDES ../../jbigi/src/jbigi.c\""
$CC -c $COMPILEFLAGS $INCLUDES ../../jbigi/src/jbigi.c || exit 1
# change the path that build_jbigi.sh expects to find the source files at.
# formerly 0002-jbigi-soname.patch
if [ "$DEBIANVERSION" ] ; then
echo "Compile: \"$CC -c $COMPILEFLAGS $INCLUDES ./jbigi/src/jbigi.c\""
$CC -c $COMPILEFLAGS $INCLUDES ./jbigi/src/jbigi.c || exit 1
else
echo "Compile: \"$CC -c $COMPILEFLAGS $INCLUDES ../../jbigi/src/jbigi.c\""
$CC -c $COMPILEFLAGS $INCLUDES ../../jbigi/src/jbigi.c || exit 1
fi
echo "Link: \"$CC $LINKFLAGS $INCLUDES -o $LIBFILE jbigi.o $INCLUDELIBS $STATICLIBS $LIBPATH\""
$CC $LINKFLAGS $INCLUDES -o $LIBFILE jbigi.o $INCLUDELIBS $STATICLIBS $LIBPATH || exit 1

40
core/c/jcpuid/build.sh
View File

@@ -55,17 +55,21 @@ if [ -z $CC ]; then
fi
if [ $BITS -eq 32 ]; then
export ABI=32
export CFLAGS="-m32 -mtune=i686 -march=i686"
export LDFLAGS="-m32"
elif [ $BITS -eq 64 ]; then
export ABI=64
export CFLAGS="-m64 -mtune=generic"
export LDFLAGS="-m64"
else
printf "BITS value \"$BITS\" not valid, please select 32 or 64\n" >&2
exit 1
# Debian builds are presumed to be native, we don't need the -mxx flag unless cross-compile,
# and this breaks the x32 build
if [ -z "$DEBIANVERSION" ] ; then
if [ $BITS -eq 32 ]; then
export ABI=32
export CFLAGS="-m32 -mtune=i686 -march=i686"
export LDFLAGS="-m32"
elif [ $BITS -eq 64 ]; then
export ABI=64
export CFLAGS="-m64 -mtune=generic"
export LDFLAGS="-m64"
else
printf "BITS value \"$BITS\" not valid, please select 32 or 64\n" >&2
exit 1
fi
fi
[ -z $ARCH ] && case `uname -m` in
@@ -125,11 +129,17 @@ case $TARGET in
exit 1
fi
LDFLAGS="${LDFLAGS} -shared -Wl,-soname,libjcpuid-${ARCH}-${UNIXTYPE}.so"
if [ $KFREEBSD -eq 1 ]; then
LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-${ARCH}-kfreebsd.so"
# rename jcpuid, formerly 0003-rename-jcpuid.patch
if [ "$DEBIANVERSION" ] ; then
LDFLAGS="${LDFLAGS} -shared -Wl,-soname,libjcpuid.so"
LIBFILE="../jbigi/libjcpuid.so"
else
LIBFILE="lib/freenet/support/CPUInformation/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
fi
CFLAGS="${CFLAGS} -fPIC -Wall"
INCLUDES="-I. -Iinclude -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${UNIXTYPE}";;