Mercurial > hg > quicktun

comparison build.sh @ 24:dfac56805c77

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed support for shared NaCl library, explicitly refer to cryptographic primitives
author Ivo Smits <Ivo@UCIS.nl>
date Mon, 28 Feb 2011 19:28:18 +0100
parents bd4259de8459
children 24e09485a8a3
comparison
equal deleted inserted replaced
23:bd4259de8459 24:dfac56805c77
23 23
24 export LIBRARY_PATH="/usr/local/lib/:${LIBRARY_PATH}" 24 export LIBRARY_PATH="/usr/local/lib/:${LIBRARY_PATH}"
25 if [ -z "${NACL_SHARED}" ]; then 25 if [ -z "${NACL_SHARED}" ]; then
26 mkdir -p lib include 26 mkdir -p lib include
27 echo Checking for NaCl library... 27 echo Checking for NaCl library...
28 if [ -e lib/libnacl.a -a -e include/crypto_box.h -a -e include/crypto_box_curve25519xsalsa20poly1305.h -a -e include/crypto_scalarmult_curve25519.h ]; then 28 if [ -e lib/libnacl.a -a -e include/crypto_box_curve25519xsalsa20poly1305.h -a -e include/crypto_scalarmult_curve25519.h ]; then
29 echo Found. 29 echo Found.
30 else 30 else
31 echo Not found, building... 31 echo Not found, building...
32 mkdir tmp/nacl 32 mkdir tmp/nacl
33 cd tmp/nacl 33 cd tmp/nacl
34 wget -q -O- http://hyperelliptic.org/nacl/nacl-20110221.tar.bz2 | bunzip2 | $tar -xf - --strip-components 1 34 wget -q -O- http://hyperelliptic.org/nacl/nacl-20110221.tar.bz2 | bunzip2 | $tar -xf - --strip-components 1
35 ./do 35 ./do
36 cd ../../ 36 cd ../../
37 cp tmp/nacl/build/*/lib/*/libnacl.a lib/ 37 cp tmp/nacl/build/*/lib/*/libnacl.a lib/
38 cp tmp/nacl/build/*/include/*/crypto_box.h include/
39 cp tmp/nacl/build/*/include/*/crypto_box_curve25519xsalsa20poly1305.h include/ 38 cp tmp/nacl/build/*/include/*/crypto_box_curve25519xsalsa20poly1305.h include/
40 cp tmp/nacl/build/*/include/*/crypto_scalarmult_curve25519.h include/ 39 cp tmp/nacl/build/*/include/*/crypto_scalarmult_curve25519.h include/
41 echo Done. 40 echo Done.
42 fi 41 fi
43 export CPATH="./include/:${CPATH}" 42 export CPATH="./include/:${CPATH}"
44 export LIBRARY_PATH="/usr/local/lib/:./lib/:${LIBRARY_PATH}" 43 export LIBRARY_PATH="/usr/local/lib/:./lib/:${LIBRARY_PATH}"
45 else 44 else
46 echo Using shared NaCl library. 45 echo Using shared NaCl library.
46 export CPATH="/usr/include/nacl/:${CPATH}"
47 fi 47 fi
48 48
49 echo Building combined binary... 49 echo Building combined binary...
50 gcc $CFLAGS -c -DCOMBINED_BINARY src/proto.raw.c -o obj/proto.raw.o 50 gcc $CFLAGS -c -DCOMBINED_BINARY src/proto.raw.c -o obj/proto.raw.o
51 gcc $CFLAGS -c -DCOMBINED_BINARY src/proto.nacl0.c -o obj/proto.nacl0.o 51 gcc $CFLAGS -c -DCOMBINED_BINARY src/proto.nacl0.c -o obj/proto.nacl0.o