Changeset ecafcdd


Ignore:
Timestamp:
May 6, 2016 3:43:38 PM (5 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
70f9cb1
Parents:
dd50b14 (diff), c2f35c0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge of '1ec1784c6eed4da97d0f3236f9fb46dea17d158b'

and '602d5ca1a488f10859327e19709700a7e1837c7c'

Location:
core/c
Files:
3 edited

Legend:

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

    rdd50b14 recafcdd  
    44# When executed in OSX: Produces a libjbigi.jnilib
    55[ -z "$CC" ] && CC="gcc"
     6
     7if [ -z $BITS ]; then
     8  if [[ $(uname -a) =~ "x86_64" ]]; then
     9    BITS=64
     10  elif [[ $(uname -a) =~ "i386" ]]; then
     11    BITS=32
     12  elif [[ $(uname -a) =~ "i686" ]]; then
     13    BITS=32
     14  else
     15    echo "Unable to detect default setting for BITS variable"
     16    exit
     17  fi
     18
     19  printf "\aBITS variable not set, defaulting to $BITS\n\a" >&2
     20fi
    621
    722# If JAVA_HOME isn't set we'll try to figure it out
  • core/c/jbigi/mbuild-all.sh

    rdd50b14 recafcdd  
    8787
    8888if [ -z $BITS ]; then
    89   BITS=32
     89  UNAME="$(uname -a)"
     90  if test "${UNAME#*x86_64}" != "x86_&4"; then
     91    BITS=64
     92  elif test "${UNAME#*i386}" != "i386"; then
     93    BITS=32
     94  elif test "${UNAME#*i686}" != "i686"; then
     95    BITS=32
     96  else
     97    echo "Unable to detect default setting for BITS variable"
     98    exit
     99  fi
     100
    90101  printf "\aBITS variable not set, defaulting to $BITS\n\a" >&2
    91102fi
     103
    92104
    93105if [ -z $CC ]; then
  • core/c/jcpuid/build.sh

    rdd50b14 recafcdd  
    2525
    2626if [ -z $BITS ]; then
    27   BITS=64
     27  UNAME="$(uname -a)"
     28  if test "${UNAME#*x86_64}" != "x86_&4"; then
     29    BITS=64
     30  elif test "${UNAME#*i386}" != "i386"; then
     31    BITS=32
     32  elif test "${UNAME#*i686}" != "i686"; then
     33    BITS=32
     34  else
     35    echo "Unable to detect default setting for BITS variable"
     36    exit
     37  fi
     38
    2839  printf "\aBITS variable not set, defaulting to $BITS\n\a" >&2
    2940fi
     41
    3042
    3143if [ -z $CC ]; then
Note: See TracChangeset for help on using the changeset viewer.