From e802cdc1947d3c68649a933963a9a8f064a2b655 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Sun, 11 Oct 2020 10:40:31 +0200 Subject: [PATCH] Update install_dependencies.sh and setup_variables.sh --- travis/install_dependencies.sh | 4 ++++ travis/setup_variables.sh | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/travis/install_dependencies.sh b/travis/install_dependencies.sh index d95a63a..17b91c0 100755 --- a/travis/install_dependencies.sh +++ b/travis/install_dependencies.sh @@ -18,6 +18,10 @@ elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo port select --set pip pip$PYTHON; pip install pyinstaller --user; export PATH=$PATH:$(python3 -c "import site; print(site.USER_BASE)")/bin; + + xcode-select --install + /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" + brew install gperf cmake openssl coreutils elif [[ "$TRAVIS_OS_NAME" == "windows" ]]; then echo "==Windows==" choco install ccache diff --git a/travis/setup_variables.sh b/travis/setup_variables.sh index a1a46a5..eef2834 100755 --- a/travis/setup_variables.sh +++ b/travis/setup_variables.sh @@ -38,7 +38,6 @@ elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export JAVA_HOME="$(/usr/libexec/java_home -v 14)" export JAVA_INCLUDE_PATH="$(/usr/libexec/java_home -v 14)/include" export CPU_CORES=" -- -j${CPU_CORES_NUM}" - export CXXFLAGS="-stdlib=libstdc++" elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export CMAKE_EXTRA_ARGUMENTS="" export TRAVIS_CPU_ARCH_JAVA="$(tr '[:upper:]' '[:lower:]'<<<"${TRAVIS_CPU_ARCH}")"