From 9e2df0c2068de168221970da11f77084f94b6536 Mon Sep 17 00:00:00 2001 From: Paul Wessel Date: Sat, 22 May 2021 11:41:47 -1000 Subject: [PATCH] Check status return of build-macos-external-list.sh properly (#5248) * Check status return of build-macos-external-list.sh properly Attempt number 1 was stupid and failed. * Manually add libomp.dylib to bundle --- admin/build-macos-external-list.sh | 3 ++- admin/build-release.sh | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/admin/build-macos-external-list.sh b/admin/build-macos-external-list.sh index 9a70de47b06..3a4b24abcdc 100755 --- a/admin/build-macos-external-list.sh +++ b/admin/build-macos-external-list.sh @@ -27,7 +27,8 @@ TMPDIR=${TMPDIR:-/tmp} # 1a. List of executables needed and whose shared libraries also are needed. # Use full path if you need something not in your path -EXEPLUSLIBS="/opt/local/bin/gsc /opt/local/bin/gm /opt/local/bin/ffmpeg /opt/local/bin/ogr2ogr /opt/local/bin/gdal_translate /opt/local/lib/libfftw3f_threads.dylib" +EXEPLUSLIBS="/opt/local/bin/gsc /opt/local/bin/gm /opt/local/bin/ffmpeg /opt/local/bin/ogr2ogr \ + /opt/local/bin/gdal_translate /opt/local/lib/libfftw3f_threads.dylib /opt/local/lib/libomp/libomp.dylib" # 1b. List of any symbolic links needed # Use full path if you need something not in your path EXELINKS=/opt/local/bin/gs diff --git a/admin/build-release.sh b/admin/build-release.sh index e9495a5548a..b8318ee2e05 100755 --- a/admin/build-release.sh +++ b/admin/build-release.sh @@ -120,8 +120,8 @@ trap abort_build SIGINT rm -rf build mkdir build # 2b. Build list of external programs and shared libraries -answer=$(admin/build-macos-external-list.sh > build/add_macOS_cpack.txt) -if [ $answer -ne 0 ]; then +admin/build-macos-external-list.sh > build/add_macOS_cpack.txt +if [ $? -ne 0 ]; then echo 'build-release.sh: Error: Requires either MacPorts of HomeBrew' >&2 exit 1 fi