merge of '52c56a56e3e6addc350299c0f86142760a6fc7cb'

     and 'a8e6813e94cbc0bdccb063d140214db36af7ac1f'

core/c/jbigi/build_jbigi.sh

@@ -5,18 +5,28 @@
 [ -z "$CC" ] && CC="gcc"
 
 if [ -z $BITS ]; then
-  if [[ $(uname -a) =~ "x86_64" ]]; then
+  UNAME="$(uname -a)"
+  if test "${UNAME#*x86_64}" != "x86_&4"; then
     BITS=64
-  elif [[ $(uname -a) =~ "i386" ]]; then
+  elif test "${UNAME#*i386}" != "i386"; then
     BITS=32
-  elif [[ $(uname -a) =~ "i686" ]]; then
+  elif test "${UNAME#*i686}" != "i686"; then
     BITS=32
+  elif test "${UNAME#*armv6}" != "armv6"; then
+    BITS=32
+  elif test "${UNAME#*armv7}" != "armv7"; then
+    BITS=32
+  elif test "${UNAME#*aarch32}" != "aarch32"; then
+    BITS=32
+  elif test "${UNAME#*aarch64}" != "aarch64"; then
+    BITS=64
   else
+ 
     echo "Unable to detect default setting for BITS variable"
     exit
   fi
 
-  printf "\aBITS variable not set, defaulting to $BITS\n\a" >&2
+  printf "\aBITS variable not set, $BITS bit system detected\n\a" >&2
 fi
 
 # If JAVA_HOME isn't set we'll try to figure it out

core/c/jbigi/mbuild-all.sh

@@ -93,12 +93,21 @@ if [ -z $BITS ]; then
     BITS=32
   elif test "${UNAME#*i686}" != "i686"; then
     BITS=32
+  elif test "${UNAME#*armv6}" != "armv6"; then
+    BITS=32
+  elif test "${UNAME#*armv7}" != "armv7"; then
+    BITS=32
+  elif test "${UNAME#*aarch32}" != "aarch32"; then
+    BITS=32
+  elif test "${UNAME#*aarch64}" != "aarch64"; then
+    BITS=64
   else
+ 
     echo "Unable to detect default setting for BITS variable"
     exit
   fi
 
-  printf "\aBITS variable not set, defaulting to $BITS\n\a" >&2
+  printf "\aBITS variable not set, $BITS bit system detected\n\a" >&2
 fi
 
 

core/c/jcpuid/build.sh

@@ -31,12 +31,21 @@ if [ -z $BITS ]; then
     BITS=32
   elif test "${UNAME#*i686}" != "i686"; then
     BITS=32
+  elif test "${UNAME#*armv6}" != "armv6"; then
+    BITS=32
+  elif test "${UNAME#*armv7}" != "armv7"; then
+    BITS=32
+  elif test "${UNAME#*aarch32}" != "aarch32"; then
+    BITS=32
+  elif test "${UNAME#*aarch64}" != "aarch64"; then
+    BITS=64
   else
+ 
     echo "Unable to detect default setting for BITS variable"
     exit
   fi
 
-  printf "\aBITS variable not set, defaulting to $BITS\n\a" >&2
+  printf "\aBITS variable not set, $BITS bit system detected\n\a" >&2
 fi