From: Rob Browning Date: Sat, 20 Jun 2020 19:19:21 +0000 (-0500) Subject: cirrus: ensure we use the real readline on macos X-Git-Tag: 0.31~37 X-Git-Url: https://arthur.barton.de/gitweb/?p=bup.git;a=commitdiff_plain;h=848ebbe38e4d901be90783b43822d4ab55a32576 cirrus: ensure we use the real readline on macos Signed-off-by: Rob Browning --- diff --git a/.cirrus.yml b/.cirrus.yml index 5c74517..15d96ec 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -62,6 +62,7 @@ task: script: | set -xe dev/prep-for-macos-build + export PKG_CONFIG_PATH=/usr/local/opt/readline/lib/pkgconfig dev/system-info make -j3 check diff --git a/dev/prep-for-macos-build b/dev/prep-for-macos-build index f639309..78ae3a5 100755 --- a/dev/prep-for-macos-build +++ b/dev/prep-for-macos-build @@ -6,3 +6,8 @@ set -ex brew update brew install par2 readline rsync pkg-config + +# This avoid's macos interference, i.e. without this it looks like we +# won't actually be able to use the readline we just installed above. +brew link --force readline +# "brew unlink readline" will undo this hack