summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2018-07-31 22:38:03 -0400
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2018-08-01 09:48:44 +0200
commit9d631d57a5c896bd34a001c25b26f932030e4fa2 (patch)
tree1715e3e349699721b44c6e3918db94a1bbf0eef8
parentb9b209f60f040d0afbccc1db0c96c8e36d14e682 (diff)
ci: explicitly set PKG_CONFIG_PATH for openssl
travis upgraded to macos high sierra overnight without notification(?) and this is now required in order to find openssl for some reason also disable config.cache to prevent configure errors Differential Revision: https://phab.enlightenment.org/D6718
-rwxr-xr-x.ci/ci-configure.sh2
-rw-r--r--.travis.yml4
2 files changed, 1 insertions, 5 deletions
diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh
index 0d1f65c253..9d57589838 100755
--- a/.ci/ci-configure.sh
+++ b/.ci/ci-configure.sh
@@ -70,7 +70,7 @@ else
70 70
71 export CFLAGS="-I/usr/local/opt/openssl/include -frewrite-includes $CFLAGS" 71 export CFLAGS="-I/usr/local/opt/openssl/include -frewrite-includes $CFLAGS"
72 export LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS" 72 export LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS"
73 export LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS" 73 export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig"
74 74
75 # Normal build test of all targets 75 # Normal build test of all targets
76 rm -f ~/.ccache/ccache.conf 76 rm -f ~/.ccache/ccache.conf
diff --git a/.travis.yml b/.travis.yml
index e4d8cc9ca4..4e19347316 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -84,10 +84,6 @@ before_script:
84 fi 84 fi
85 85
86 - .ci/ci-ccache-stats.sh 86 - .ci/ci-ccache-stats.sh
87 - |
88 if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
89 cp $HOME/cachedir/config.cache . || true
90 fi
91 87
92script: 88script:
93 - .ci/ci-configure.sh "$CI_BUILD_TYPE" 89 - .ci/ci-configure.sh "$CI_BUILD_TYPE"