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

diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh
index 0d1f65c..9d57589 100755 (executable)
--- a/.ci/ci-configure.sh
+++ b/.ci/ci-configure.sh
@@ -70,7 +70,7 @@ else
 
   export CFLAGS="-I/usr/local/opt/openssl/include -frewrite-includes $CFLAGS"
   export LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS"
-  export LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS"
+  export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig"
 
   # Normal build test of all targets
   rm -f ~/.ccache/ccache.conf

diff --git a/.travis.yml b/.travis.yml
index e4d8cc9..4e19347 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -84,10 +84,6 @@ before_script:
       fi
 
   - .ci/ci-ccache-stats.sh
-  - |
-       if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-         cp $HOME/cachedir/config.cache . || true
-       fi
 
 script:
   - .ci/ci-configure.sh "$CI_BUILD_TYPE"