Mercurial > hg > quicktun

comparison build.sh @ 30:6f0e6b7dc088

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed build script to support multiple abis on one machine, bugfix in code, minor improvements
author Ivo Smits <Ivo@UCIS.nl>
date Thu, 04 Aug 2011 18:17:06 +0200
parents 24e09485a8a3
children a51d07ac3f1b
comparison
equal deleted inserted replaced
29:7c5e5be876bb 30:6f0e6b7dc088
6 elif [ "$(uname -s)" = "SunOS" ]; then 6 elif [ "$(uname -s)" = "SunOS" ]; then
7 echo "Detected SunOS" 7 echo "Detected SunOS"
8 tar="gtar" 8 tar="gtar"
9 CFLAGS="$CFLAGS -DSOLARIS -m64" 9 CFLAGS="$CFLAGS -DSOLARIS -m64"
10 LDFLAGS="$LDFLAGS -lnsl -lsocket" 10 LDFLAGS="$LDFLAGS -lnsl -lsocket"
11 elif [ "$(uname -s)" = "Darwin" ]; then
12 echo "Detected Mac OS X (Darwin)"
13 CFLAGS="$CFLAGS -arch i686"
14 LDFLAGS="$LDFLAGS -arch i686"
11 else 15 else
12 tar="tar" 16 tar="tar"
13 fi 17 fi
14 18
15 echo Cleaning up... 19 echo Cleaning up...
29 echo Found. 33 echo Found.
30 else 34 else
31 echo Not found, building... 35 echo Not found, building...
32 mkdir tmp/nacl 36 mkdir tmp/nacl
33 cd tmp/nacl 37 cd tmp/nacl
34 wget -q -O- http://hyperelliptic.org/nacl/nacl-20110221.tar.bz2 | bunzip2 | $tar -xf - --strip-components 1 38 NACLURL="http://hyperelliptic.org/nacl/nacl-20110221.tar.bz2"
39 (wget -q -O- "${NACLURL}" || curl -q "${NACLURL}") | bunzip2 | $tar -xf - --strip-components 1
35 ./do 40 ./do
36 cd ../../ 41 cd ../../
37 cp tmp/nacl/build/*/lib/*/libnacl.a lib/ 42 ABI=`nacl/build/*/bin/okabi | head -n 1`
38 cp tmp/nacl/build/*/include/*/crypto_box_curve25519xsalsa20poly1305.h include/ 43 cp "tmp/nacl/build/*/lib/${ABI}/libnacl.a" lib/
39 cp tmp/nacl/build/*/include/*/crypto_scalarmult_curve25519.h include/ 44 cp "tmp/nacl/build/*/include/${ABI}/crypto_box_curve25519xsalsa20poly1305.h" include/
45 cp "tmp/nacl/build/*/include/${ABI}/crypto_scalarmult_curve25519.h" include/
40 echo Done. 46 echo Done.
41 fi 47 fi
42 export CPATH="./include/:${CPATH}" 48 export CPATH="./include/:${CPATH}"
43 export LIBRARY_PATH="/usr/local/lib/:./lib/:${LIBRARY_PATH}" 49 export LIBRARY_PATH="/usr/local/lib/:./lib/:${LIBRARY_PATH}"
44 else 50 else