diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-03-03 03:16:32 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-03-03 03:16:32 +0000 |
| commit | 37788267802349c3b6c8fa4e28664872bc391d60 (patch) | |
| tree | 0beeab3ae474dfa63e8baa0b5be21118be3dd115 | |
| parent | f76211852f915f6677c87b4bc39bc1e063362f84 (diff) | |
.travis.yml: CONFIG_FLAG
* .travis.yml (before_install): merge options for extension
libraries to CONFIG_FLAG.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49816 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | .travis.yml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 775ad5376c..8b34110bd1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,12 +34,13 @@ os: # version string for Debian/Ubuntu, and no dependencies have been changed so # far since the 1.9.1 release. before_install: + - "CONFIG_FLAG=" - "if [[ $TRAVIS_OS_NAME = 'linux' ]]; then sudo apt-get -qq update; fi" - "if [[ $TRAVIS_OS_NAME = 'linux' ]]; then sudo apt-get -qq install $CC; fi" # upgrade if any - "if [[ $TRAVIS_OS_NAME = 'linux' ]]; then JOBS='-j'; fi" - "if [[ $TRAVIS_OS_NAME = 'osx' ]]; then brew install autoconf gdbm openssl; fi" - - "if [[ $TRAVIS_OS_NAME = 'osx' ]]; then GDBM_FLAG=\"--with-gdbm-dir=`brew --prefix gdbm`\"; fi" - - "if [[ $TRAVIS_OS_NAME = 'osx' ]]; then OPENSSL_FLAG=\"--with-openssl-dir=`brew --prefix openssl`\"; fi" + - "if [[ $TRAVIS_OS_NAME = 'osx' ]]; then CONFIG_FLAG=\"$CONFIG_FLAG --with-gdbm-dir=`brew --prefix gdbm`\"; fi" + - "if [[ $TRAVIS_OS_NAME = 'osx' ]]; then CONFIG_FLAG=\"$CONFIG_FLAG --with-openssl-dir=`brew --prefix openssl`\"; fi" - "if [[ $TRAVIS_OS_NAME = 'osx' && $CC = 'gcc' ]]; then CC='gcc-4.9'; fi" install: "if [[ $TRAVIS_OS_NAME = 'linux' ]]; then sudo apt-get -qq build-dep ruby1.9.1 2>/dev/null; fi" @@ -54,7 +55,7 @@ before_script: - "make -f common.mk BASERUBY=ruby MAKEDIRS='mkdir -p' srcdir=. update-config_files" - "autoconf" - "mkdir config_1st config_2nd" - - "./configure -C --disable-install-doc --with-gcc=$CC $OPENSSL_FLAG" + - "./configure -C --disable-install-doc --with-gcc=$CC $CONFIG_FLAG" - "cp -pr config.status .ext/include config_1st" - "make reconfig" - "cp -pr config.status .ext/include config_2nd" |