From 8e9fe7e054759065c6dc5f59ecd985bf6de777f7 Mon Sep 17 00:00:00 2001 From: Darren Thompson Date: Wed, 16 Oct 2019 23:29:40 -0400 Subject: [PATCH] ci: Update macOS build script to use GNU compat greadlink --- .travis.yml | 1 + build.sh | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 318a283230..0470f86cf1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,6 +52,7 @@ addons: - pixman - sdl2 - libepoxy + - coreutils git: # we want to do this ourselves diff --git a/build.sh b/build.sh index c4ae6bac14..87b44f7039 100755 --- a/build.sh +++ b/build.sh @@ -37,6 +37,7 @@ do esac done +readlink=$(command -v readlink) case "$(uname -s)" in # adjust compilation option based on platform Linux) @@ -50,6 +51,13 @@ case "$(uname -s)" in # adjust compilation option based on platform sys_opts='--disable-cocoa' # necessary to find libffi, which is required by gobject export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}/usr/local/opt/libffi/lib/pkgconfig" + # macOS needs greadlink for a GNU compatible version of readlink + if readlink=$(command -v greadlink); then + echo 'GNU compatible readlink detected' + else + echo 'Could not find a GNU compatible readlink. Please install coreutils with homebrew' + exit -1 + fi ;; CYGWIN*|MINGW*|MSYS*) echo 'Compiling for Windows…' @@ -64,7 +72,7 @@ case "$(uname -s)" in # adjust compilation option based on platform esac # find absolute path (and resolve symlinks) to build out of tree -configure="$(dirname "$(readlink -f "${0}")")/configure" +configure="$(dirname "$($readlink -f "${0}")")/configure" set -x # Print commands from now on