I2P Address: [http://git.idk.i2p]

Skip to content
Snippets Groups Projects
Commit d7e1f62d authored by zzz's avatar zzz
Browse files

Build: Fix Debian build on ARM (ticket #1801)

- Fix other jbigi/jcpuid build script errors and typos
- Nonzero exit code missing on some jbigi/jcpuid build script failures
- Refresh patch
parent dbd1ae0d
No related branches found
No related tags found
No related merge requests found
...@@ -4,26 +4,26 @@ ...@@ -4,26 +4,26 @@
# When executed in OSX: Produces a libjbigi.jnilib # When executed in OSX: Produces a libjbigi.jnilib
[ -z "$CC" ] && CC="gcc" [ -z "$CC" ] && CC="gcc"
UNAME="$(uname -m)"
if [ -z $BITS ]; then if [ -z $BITS ]; then
UNAME="$(uname -a)" if test "${UNAME#*x86_64}" != "$UNAME"; then
if test "${UNAME#*x86_64}" != "x86_&4"; 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 "BITS variable not set, $BITS bit system detected\n" >&2 printf "BITS variable not set, $BITS bit system detected\n" >&2
...@@ -85,8 +85,8 @@ else ...@@ -85,8 +85,8 @@ else
STATICLIBS=".libs/libgmp.a" STATICLIBS=".libs/libgmp.a"
fi fi
[ $BITS -eq 32 ] && COMPILEFLAGS="-m32 $COMPILEFLAGS" && LINKFLAGS="-m32 $LINKFLAGS" [ $BITS -eq 32 -a "${UNAME#*86}" != "$UNAME" ] && COMPILEFLAGS="-m32 $COMPILEFLAGS" && LINKFLAGS="-m32 $LINKFLAGS"
[ $BITS -eq 64 ] && COMPILEFLAGS="-m64 $COMPILEFLAGS" && LINKFLAGS="-m64 $LINKFLAGS" [ $BITS -eq 64 -a "${UNAME#*86}" != "$UNAME" ] && COMPILEFLAGS="-m64 $COMPILEFLAGS" && LINKFLAGS="-m64 $LINKFLAGS"
echo "Compiling C code..." echo "Compiling C code..."
echo "Compile: \"$CC -c $COMPILEFLAGS $INCLUDES ../../jbigi/src/jbigi.c\"" echo "Compile: \"$CC -c $COMPILEFLAGS $INCLUDES ../../jbigi/src/jbigi.c\""
......
...@@ -19,30 +19,30 @@ case $TARGET in ...@@ -19,30 +19,30 @@ case $TARGET in
echo "Building `uname -s |tr [A-Z] [a-z]` .sos";; echo "Building `uname -s |tr [A-Z] [a-z]` .sos";;
*) *)
echo "Unsupported build environment" echo "Unsupported build environment"
exit;; exit 1;;
esac esac
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 "BITS variable not set, $BITS bit system detected\n" >&2 printf "BITS variable not set, $BITS bit system detected\n" >&2
......
...@@ -23,7 +23,7 @@ index 1521392..6a89c92 100755 ...@@ -23,7 +23,7 @@ index 1521392..6a89c92 100755
LIBFILE="libjbigi.so";; LIBFILE="libjbigi.so";;
*) *)
@@ -89,8 +89,8 @@ @@ -89,8 +89,8 @@
[ $BITS -eq 64 ] && COMPILEFLAGS="-m64 $COMPILEFLAGS" && LINKFLAGS="-m64 $LINKFLAGS" [ $BITS -eq 64 -a "${UNAME#*86}" != "$UNAME" ] && COMPILEFLAGS="-m64 $COMPILEFLAGS" && LINKFLAGS="-m64 $LINKFLAGS"
echo "Compiling C code..." echo "Compiling C code..."
-echo "Compile: \"$CC -c $COMPILEFLAGS $INCLUDES ../../jbigi/src/jbigi.c\"" -echo "Compile: \"$CC -c $COMPILEFLAGS $INCLUDES ../../jbigi/src/jbigi.c\""
......
2016-06-01 zzz
* Build: Fix Debian build on ARM (ticket #1801)
2016-05-29 zzz 2016-05-29 zzz
* Console: Fix /configfamily form (ticket #1797) * Console: Fix /configfamily form (ticket #1797)
   
......
...@@ -18,10 +18,10 @@ public class RouterVersion { ...@@ -18,10 +18,10 @@ public class RouterVersion {
/** deprecated */ /** deprecated */
public final static String ID = "Monotone"; public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION; public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 15; public final static long BUILD = 16;
/** for example "-test" */ /** for example "-test" */
public final static String EXTRA = ""; public final static String EXTRA = "-rc";
public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
public static void main(String args[]) { public static void main(String args[]) {
System.out.println("I2P Router version: " + FULL_VERSION); System.out.println("I2P Router version: " + FULL_VERSION);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment