Skip to content

Commit

Permalink
Check status return of build-macos-external-list.sh properly (#5248)
Browse files Browse the repository at this point in the history
* Check status return of build-macos-external-list.sh properly

Attempt number 1 was stupid and failed.

* Manually add libomp.dylib to bundle
  • Loading branch information
PaulWessel authored May 22, 2021
1 parent 834fbc3 commit 9e2df0c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion admin/build-macos-external-list.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions admin/build-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 9e2df0c

Please sign in to comment.