generic-library/libreSSL
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use newer cmake for travis linux builds, revise build script

Browse Source
This commit is contained in:
Brent Cook 2015-09-09 06:59:35 -05:00
parent 2728a86590
commit c0341ad131
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
scripts/travis
View File

@ -3,10 +3,10 @@ set -e
./autogen.sh ./autogen.sh
if [ "x$ARCH" = "xnative" ]; then if "x$ARCH" = "xnative"; then
# test autotools # test autotools
./configure ./configure
if [ `uname` = "Darwin" ]; then if `uname` = "Darwin"; then
# OS X runs out of resources if we run 'make -j check' # OS X runs out of resources if we run 'make -j check'
make check make check
else else
@ -17,23 +17,29 @@ if [ "x$ARCH" = "xnative" ]; then
make dist make dist
tar zxvf libressl-*.tar.gz tar zxvf libressl-*.tar.gz
cd libressl-* cd libressl-*
# test cmake and ninja
mkdir build mkdir build
cd build cd build
cmake ..
make # test cmake and ninja
if `uname` = "Darwin"; then
cmake ..
make
else
sudo apt-add-repository -y ppa:kalakris/cmake
sudo apt-get update
sudo apt-get install -y $ARCH-x-gcc cmake ninja-build
cmake .. -GNinja
make
fi
else else
CPU=i686 CPU=i686
if [ "x$ARCH" = "xmingw64" ]; then if "x$ARCH" = "xmingw64"; then
CPU=x86_64 CPU=x86_64
fi fi
export CC=$CPU-w64-mingw32-gcc export CC=$CPU-w64-mingw32-gcc
if [ -z $(which $CC) ]; then if ! hash $CC 2>/dev/null; then
# Update Ubuntu 12.04 with current mingw toolchain # Update Ubuntu 12.04 with current mingw toolchain
sudo apt-get update
sudo apt-get install -y python-software-properties
sudo apt-add-repository -y ppa:tobydox/mingw-x-precise sudo apt-add-repository -y ppa:tobydox/mingw-x-precise
sudo apt-get update sudo apt-get update
sudo apt-get install -y $ARCH-x-gcc make sudo apt-get install -y $ARCH-x-gcc make