Kouhei Sutou
null+****@clear*****
Mon Jan 30 17:58:09 JST 2017
Kouhei Sutou 2017-01-30 17:58:09 +0900 (Mon, 30 Jan 2017) New Revision: 2e112bf145eba7b6036f380b6d9337f6d49f59e2 https://github.com/groonga/groonga/commit/2e112bf145eba7b6036f380b6d9337f6d49f59e2 Message: travis: pass PKG_CONFIG_PATH as configure argument Modified files: tools/travis-before-script.sh tools/travis-install.sh Modified: tools/travis-before-script.sh (+4 -4) =================================================================== --- tools/travis-before-script.sh 2017-01-30 14:34:48 +0900 (14a19a1) +++ tools/travis-before-script.sh 2017-01-30 17:58:09 +0900 (87ed575) @@ -5,10 +5,6 @@ set -u : ${ENABLE_MRUBY:=no} -if [ "${TRAVIS_OS_NAME}" = "osx" ]; then - export PKG_CONFIG_PATH="$(brew --prefix openssl)/lib/pkgconfig" -fi - git submodule update --init --depth 1 prefix=/tmp/local @@ -18,6 +14,10 @@ case "${BUILD_TOOL}" in ./autogen.sh configure_args="" + if [ "${TRAVIS_OS_NAME}" = "osx" ]; then + pkg_config_path="$(brew --prefix openssl)/lib/pkgconfig" + configure_args="${configure_args} PKG_CONFIG_PATH=${pkg_config_path}" + fi #if [ "$CC" = "clang" ]; then configure_args="${configure_args} --enable-debug" #fi Modified: tools/travis-install.sh (+1 -2) =================================================================== --- tools/travis-install.sh 2017-01-30 14:34:48 +0900 (8613350) +++ tools/travis-install.sh 2017-01-30 17:58:09 +0900 (3597892) @@ -27,8 +27,7 @@ case "${TRAVIS_OS_NAME}" in mecab \ mecab-ipadic \ pcre \ - cutter \ - openssl + cutter pkg-config --modversion libssl pkg-config --cflags --libs libssl ;; -------------- next part -------------- HTML����������������������������...Download