From f34b2caaed08e35272d27f429b2e3c40acd025a8 Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Thu, 3 Nov 2022 16:43:02 +0100 Subject: [PATCH] CI mac: use wolfSSL instead of OpenSSL Use of OpenSSL required a bit tweaking on mac. Also the new library is faster and and smaller, which makes is better suitable for UG. Note: other platforms are not compatible with wolfSSL yet - U18.04 does contain old/incompatible version. MSYS2 doesn't build wolfSSL. --- .github/scripts/macOS/prepare.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/scripts/macOS/prepare.sh b/.github/scripts/macOS/prepare.sh index 2aa55e967..10276d162 100755 --- a/.github/scripts/macOS/prepare.sh +++ b/.github/scripts/macOS/prepare.sh @@ -12,15 +12,14 @@ LIBRARY_PATH=/usr/local/lib:/usr/local/opt/qt/lib printf "%b" "UG_SKIP_NET_TESTS=1\n"\ "CPATH=$CPATH\n"\ "LIBRARY_PATH=$LIBRARY_PATH\n" >> "$GITHUB_ENV" -# libcrypto.pc (and other libcrypto files) is not linked to /usr/local/{lib,include} because conflicting with system libcrypto -echo "PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/local/opt/qt/lib/pkgconfig:/usr/local/opt/openssl/lib/pkgconfig" >> "$GITHUB_ENV" +echo "PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/local/opt/qt/lib/pkgconfig" >> "$GITHUB_ENV" echo "/usr/local/opt/qt/bin" >> "$GITHUB_PATH" echo "DYLIBBUNDLER_FLAGS=$DYLIBBUNDLER_FLAGS" >> "$GITHUB_ENV" brew install autoconf automake cppunit libtool pkg-config brew install libsoxr speexdsp brew install ffmpeg portaudio sdl2 sdl2_mixer sdl2_ttf -brew install imagemagick jack libnatpmp opencv openssl +brew install imagemagick jack libnatpmp opencv wolfssl brew install ossp-uuid # for cineform brew install qt@5 brew install glm