comparison build.sh @ 34:b876afa5a72a

Fixed the build script and FreeBSD tun mode
author Ivo Smits <Ivo@UCIS.nl>
date Wed, 12 Oct 2011 03:47:18 +0200
parents a51d07ac3f1b
children d9f5caa13898
comparison
equal deleted inserted replaced
33:422f3582bd38 34:b876afa5a72a
37 cd tmp/nacl 37 cd tmp/nacl
38 NACLURL="http://hyperelliptic.org/nacl/nacl-20110221.tar.bz2" 38 NACLURL="http://hyperelliptic.org/nacl/nacl-20110221.tar.bz2"
39 (wget -q -O- "${NACLURL}" || curl -q "${NACLURL}") | bunzip2 | $tar -xf - --strip-components 1 39 (wget -q -O- "${NACLURL}" || curl -q "${NACLURL}") | bunzip2 | $tar -xf - --strip-components 1
40 ./do 40 ./do
41 cd ../../ 41 cd ../../
42 ABI=`tmp/nacl/build/*/bin/okabi | head -n 1` 42 NACLDIR="tmp/nacl/build/`hostname | sed 's/\..*//' | tr -cd '[a-z][A-Z][0-9]'`"
43 cp "tmp/nacl/build/*/lib/${ABI}/libnacl.a" lib/ 43 ABI=`"${NACLDIR}/bin/okabi" | head -n 1`
44 cp "tmp/nacl/build/*/include/${ABI}/crypto_box_curve25519xsalsa20poly1305.h" include/ 44 cp "${NACLDIR}/lib/${ABI}/libnacl.a" lib/
45 cp "tmp/nacl/build/*/include/${ABI}/crypto_scalarmult_curve25519.h" include/ 45 cp "${NACLDIR}/include/${ABI}/crypto_box_curve25519xsalsa20poly1305.h" include/
46 cp "${NACLDIR}/include/${ABI}/crypto_scalarmult_curve25519.h" include/
46 echo Done. 47 echo Done.
47 fi 48 fi
48 export CPATH="./include/:${CPATH}" 49 export CPATH="./include/:${CPATH}"
49 export LIBRARY_PATH="/usr/local/lib/:./lib/:${LIBRARY_PATH}" 50 export LIBRARY_PATH="./lib/:${LIBRARY_PATH}"
50 else 51 else
51 echo Using shared NaCl library. 52 echo Using shared NaCl library.
52 export CPATH="/usr/include/nacl/:${CPATH}" 53 export CPATH="/usr/include/nacl/:${CPATH}"
53 fi 54 fi
54 55
76 ./build.sh 77 ./build.sh
77 cd .. 78 cd ..
78 fi 79 fi
79 fi 80 fi
80 81
81 rm -rf obj tmp