diff options
| author | Jack Lloyd <[email protected]> | 2015-07-02 06:46:57 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2015-07-02 06:46:57 -0400 |
| commit | 81596ebe15f11d87372212b8f1a99041c6eb29c0 (patch) | |
| tree | 8d164a8ab8079bcca10724b5f9fec029a4bef3f6 | |
| parent | 7fd9cc3c72aa5ea5d0e57b39d46b4801c359217b (diff) | |
| parent | cb3d7db72be550df3cce223a08e74c79eab24205 (diff) | |
Merge branch 'master' of github.com:randombit/botan
| -rw-r--r-- | .travis.yml | 7 | ||||
| -rwxr-xr-x | configure.py | 2 | ||||
| -rwxr-xr-x | src/scripts/ci/build.sh | 4 | ||||
| -rwxr-xr-x | src/scripts/ci/setup.sh | 19 |
4 files changed, 19 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml index e1fe0daef..35f374658 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ language: cpp os: - linux + - osx compiler: - clang @@ -15,12 +16,12 @@ env: matrix: exclude: + - os: osx + compiler: gcc - compiler: clang env: BUILD_MODE="coverage" -before_install: - - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test - - sudo apt-get update -qq +sudo: required install: - ./src/scripts/ci/setup.sh diff --git a/configure.py b/configure.py index 110ba9ed0..b04793877 100755 --- a/configure.py +++ b/configure.py @@ -1321,7 +1321,7 @@ def create_template_vars(build_config, options, modules, cc, arch, osinfo): 'with_sphinx': options.with_sphinx } - if options.os == 'darwin': + if options.os == 'darwin' and options.build_shared_lib: vars['app_post_link_cmd'] = 'install_name_tool -change "/$(SONAME)" "@executable_path/$(SONAME)" $(APP)' vars['test_post_link_cmd'] = 'install_name_tool -change "/$(SONAME)" "@executable_path/$(SONAME)" $(TEST)' else: diff --git a/src/scripts/ci/build.sh b/src/scripts/ci/build.sh index 5d88260d4..2d75a3901 100755 --- a/src/scripts/ci/build.sh +++ b/src/scripts/ci/build.sh @@ -13,5 +13,5 @@ fi $CXX --version python configure.py $CFG_FLAGS --cc=$CC --cc-bin=$CXX --with-openssl --with-sqlite --with-zlib -make -j 4 -LD_LIBRARY_PATH=. ./botan-test +make -j 2 +./botan-test diff --git a/src/scripts/ci/setup.sh b/src/scripts/ci/setup.sh index 85edf6a25..97019fd57 100755 --- a/src/scripts/ci/setup.sh +++ b/src/scripts/ci/setup.sh @@ -2,13 +2,18 @@ set -ev -sudo apt-get install -y g++-4.8 -sudo apt-get install -y libssl-dev -sudo apt-get install -y libz-dev -sudo apt-get install -y libsqlite3-dev -sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90 -sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 90 -sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-4.8 90 +if [ "$TRAVIS_OS_NAME" = "linux" ]; then + sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test + sudo apt-get update -qq + + sudo apt-get install -y g++-4.8 + sudo apt-get install -y libssl-dev + sudo apt-get install -y libz-dev + sudo apt-get install -y libsqlite3-dev + sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90 + sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 90 + sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-4.8 90 +fi if [ "$BUILD_MODE" = "coverage" ]; then wget http://ftp.de.debian.org/debian/pool/main/l/lcov/lcov_1.11.orig.tar.gz |