cirrus: ensure we use the real readline on macos

Signed-off-by: Rob Browning <rlb@defaultvalue.org>

diff --git a/.cirrus.yml b/.cirrus.yml
index 5c74517b0894f87f9680a469397898892f172a2e..15d96ec32da17bc4646962e70ceeb325abd038c6 100644 (file)
--- 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 f63930968369def4cef2a8dfba9250ad387ecc39..78ae3a50dc5af52ca5fe6e128cd4f8c81b126f1b 100755 (executable)
--- 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