From dd1140254b56774543e19a2e41e4e6b2665eb152 Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Wed, 3 Jun 2020 15:19:29 +0200 Subject: [PATCH] GitHub CI [Mac]: pass NDI path to DYLIBBUNDLER_FLAGS --- .github/scripts/macOS/prepare.sh | 6 +++--- configure.ac | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/scripts/macOS/prepare.sh b/.github/scripts/macOS/prepare.sh index b1861ffc2..58c86b2b4 100755 --- a/.github/scripts/macOS/prepare.sh +++ b/.github/scripts/macOS/prepare.sh @@ -49,15 +49,15 @@ if [ -n "$sdk_pass" -a "$GITHUB_REF" = refs/heads/ndi-build ]; then curl --netrc-file <(cat <<<"machine frakira.fi.muni.cz login sdk password $sdk_pass") https://frakira.fi.muni.cz/~xpulec/sdks/NDISDK_Apple.pkg -O sudo installer -pkg NDISDK_Apple.pkg -target / rm NDISDK_Apple.pkg - sudo ln -s "/Library/NDI SDK for Apple/" /Library/NDI + sudo mv "/Library/NDI SDK for Apple/" /Library/NDI cd /Library/NDI/lib/x64 sudo ln -s libndi.?.dylib libndi.dylib export CPATH=${CPATH:+"$CPATH:"}/Library/NDI/include export LIBRARY_PATH=${LIBRARY_PATH:+"$LIBRARY_PATH:"}/Library/NDI/lib/x64 - export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+"$DYLD_LIBRARY_PATH:"}/Library/NDI/lib/x64 + export DYLIBBUNDLER_FLAGS="${DYLIBBUNDLER_FLAGS:+$DYLIBBUNDLER_FLAGS }-s /Library/NDI/lib/x64" echo "::set-env name=CPATH::$CPATH" echo "::set-env name=LIBRARY_PATH::$LIBRARY_PATH" - echo "::set-env name=DYLD_LIBRARY_PATH::$DYLD_LIBRARY_PATH" + echo "::set-env name=DYLIBBUNDLER_FLAGS::$DYLIBBUNDLER_FLAGS" cd $TEMP_INST fi diff --git a/configure.ac b/configure.ac index 0176627b6..fcf03eef6 100644 --- a/configure.ac +++ b/configure.ac @@ -2148,7 +2148,7 @@ then if test $system = MacOSX; then LDFLAGS="$LDFLAGS${LDFLAGS:+ }-rpath $CUDA_LIB_PATH" - DYLIBBUNDLER_FLAGS="-s $CUDA_LIB_PATH" + DYLIBBUNDLER_FLAGS="${DYLIBBUNDER_FLAGS:+$DYLIBBUNDLER_FLAGS }-s $CUDA_LIB_PATH" fi fi