From 252b91adbcc3b2644ecb40ccced7790fb8d5d11d Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Mon, 27 Apr 2020 14:28:10 +0200 Subject: [PATCH] GitHub CI: Pass dylibbundler - /usr/local/lib Fixes a problem when dylibbundler cannot find @loader_path/libamd.2.dylib. --- .github/scripts/macOS/prepare.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/scripts/macOS/prepare.sh b/.github/scripts/macOS/prepare.sh index 09b827846..47e98565b 100755 --- a/.github/scripts/macOS/prepare.sh +++ b/.github/scripts/macOS/prepare.sh @@ -7,6 +7,8 @@ export SDKROOT=macosx10.14 echo "::set-env name=AJA_DIRECTORY::$AJA_INST" echo "::set-env name=UG_SKIP_NET_TESTS::1" echo "::set-env name=CPATH::/usr/local/include:/usr/local/opt/qt/include" +echo "::set-env name=EXTRA_LIB_PATH::/usr/local/lib" # workaround for dylibbunder inside Makefile (DYLD_LIBRARY_PATH is stripped + # by make) to resolve paths like @loader_path/ (see https://github.com/auriamg/macdylibbundler/issues/22) echo "::set-env name=LIBRARY_PATH::/usr/local/lib:/usr/local/opt/qt/lib" # libcrypto.pc (and other libcrypto files) is not linked to /usr/local/{lib,include} because conflicting with system libcrypto echo "::set-env name=PKG_CONFIG_PATH::/usr/local/lib/pkgconfig:/usr/local/opt/qt/lib/pkgconfig:/usr/local/opt/openssl/lib/pkgconfig"