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

mbuild-all script fixes

Browse Source
This commit is contained in:
zzz
2016-06-06 12:37:06 +00:00
parent 280ca2cf2f
commit 63272d3cfc
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/c/jbigi/mbuild-all.sh
View File

@@ -79,34 +79,32 @@ if [ ! -f "$JAVA_HOME/include/jni.h" ]; then
fi fi
if ! command -v m4 > /dev/null; then if ! command -v m4 > /dev/null; then
printf "\aWARNING: \`m4\` not found. If this process fails to complete, install m4 " >&2 printf "\aWARNING: \`m4\` not found. Install m4 " >&2
printf "and re-run this script.\n\n\n\a" >&2 printf "and re-run this script.\n\n\n\a" >&2
exit 1 exit 1
fi fi
if [ -z $BITS ]; then if [ -z $BITS ]; then
UNAME="$(uname -a)" UNAME="$(uname -m)"
if test "${UNAME#*x86_64}" != "x86_&4"; then if test "${UNAME#*x86_64}" != "$UNAME"; then
BITS=64 BITS=64
elif test "${UNAME#*i386}" != "i386"; then elif test "${UNAME#*i386}" != "$UNAME"; then
BITS=32 BITS=32
elif test "${UNAME#*i686}" != "i686"; then elif test "${UNAME#*i686}" != "$UNAME"; then
BITS=32 BITS=32
elif test "${UNAME#*armv6}" != "armv6"; then elif test "${UNAME#*armv6}" != "$UNAME"; then
BITS=32 BITS=32
elif test "${UNAME#*armv7}" != "armv7"; then elif test "${UNAME#*armv7}" != "$UNAME"; then
BITS=32 BITS=32
elif test "${UNAME#*aarch32}" != "aarch32"; then elif test "${UNAME#*aarch32}" != "$UNAME"; then
BITS=32 BITS=32
elif test "${UNAME#*aarch64}" != "aarch64"; then elif test "${UNAME#*aarch64}" != "$UNAME"; then
BITS=64 BITS=64
else else
echo "Unable to detect default setting for BITS variable" echo "Unable to detect default setting for BITS variable"
exit exit 1
fi fi
printf "\aBITS variable not set, $BITS bit system detected\n\a" >&2 printf "\aBITS variable not set, $BITS bit system detected\n\a" >&2
fi fi
@@ -116,6 +114,7 @@ if [ -z $CC ]; then
printf "\aCC variable not set, defaulting to $CC\n\a" >&2 printf "\aCC variable not set, defaulting to $CC\n\a" >&2
fi fi
# FIXME -m32 and -m64 are only for x86
if [ $BITS -eq 32 ]; then if [ $BITS -eq 32 ]; then
export ABI=32 export ABI=32
export CFLAGS="-m32" export CFLAGS="-m32"