Ignore:
Timestamp:
Jun 1, 2016 5:45:27 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
1583f35
Parents:
dbd1ae0d
Message:

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
File:
1 edited

Legend:

Unmodified
Added
Removed
  • core/c/jbigi/build_jbigi.sh

    rdbd1ae0d rd7e1f62  
    55[ -z "$CC" ] && CC="gcc"
    66
     7UNAME="$(uname -m)"
    78if [ -z $BITS ]; then
    8   UNAME="$(uname -a)"
    9   if test "${UNAME#*x86_64}" != "x86_&4"; then
     9  if test "${UNAME#*x86_64}" != "$UNAME"; then
    1010    BITS=64
    11   elif test "${UNAME#*i386}" != "i386"; then
     11  elif test "${UNAME#*i386}" != "$UNAME"; then
    1212    BITS=32
    13   elif test "${UNAME#*i686}" != "i686"; then
     13  elif test "${UNAME#*i686}" != "$UNAME"; then
    1414    BITS=32
    15   elif test "${UNAME#*armv6}" != "armv6"; then
     15  elif test "${UNAME#*armv6}" != "$UNAME"; then
    1616    BITS=32
    17   elif test "${UNAME#*armv7}" != "armv7"; then
     17  elif test "${UNAME#*armv7}" != "$UNAME"; then
    1818    BITS=32
    19   elif test "${UNAME#*aarch32}" != "aarch32"; then
     19  elif test "${UNAME#*aarch32}" != "$UNAME"; then
    2020    BITS=32
    21   elif test "${UNAME#*aarch64}" != "aarch64"; then
     21  elif test "${UNAME#*aarch64}" != "$UNAME"; then
    2222    BITS=64
    2323  else
    2424 
    2525    echo "Unable to detect default setting for BITS variable"
    26     exit
     26    exit 1
    2727  fi
    2828
     
    8686fi
    8787
    88 [ $BITS -eq 32 ] && COMPILEFLAGS="-m32 $COMPILEFLAGS" && LINKFLAGS="-m32 $LINKFLAGS"
    89 [ $BITS -eq 64 ] && COMPILEFLAGS="-m64 $COMPILEFLAGS" && LINKFLAGS="-m64 $LINKFLAGS"
     88[ $BITS -eq 32 -a "${UNAME#*86}" != "$UNAME" ] && COMPILEFLAGS="-m32 $COMPILEFLAGS" && LINKFLAGS="-m32 $LINKFLAGS"
     89[ $BITS -eq 64 -a "${UNAME#*86}" != "$UNAME" ] && COMPILEFLAGS="-m64 $COMPILEFLAGS" && LINKFLAGS="-m64 $LINKFLAGS"
    9090
    9191echo "Compiling C code..."
Note: See TracChangeset for help on using the changeset viewer.