From 0719b75307404f02e4ed6bf702ca74a79bd22c2f Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Tue, 20 Oct 2020 22:28:09 +0200 Subject: [PATCH 1/4] try to use brew version of lz4 --- CI/before_install.osx.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh index 9edfdf0d29..28acae13cc 100755 --- a/CI/before_install.osx.sh +++ b/CI/before_install.osx.sh @@ -4,6 +4,7 @@ command -v ccache >/dev/null 2>&1 || brew install ccache command -v cmake >/dev/null 2>&1 || brew install cmake command -v qmake >/dev/null 2>&1 || brew install qt +command -v lz4 >/dev/null 2>&1 || brew install lz4 -curl -fSL -R -J https://downloads.openmw.org/osx/dependencies/openmw-deps-20201016.zip -o ~/openmw-deps.zip +curl -fSL -R -J https://downloads.openmw.org/osx/dependencies/openmw-deps-ef2462c.zip -o ~/openmw-deps.zip unzip -o ~/openmw-deps.zip -d /private/tmp/openmw-deps > /dev/null From c3b464a0c82d9a8ce0761054109d6374013af7c5 Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Tue, 20 Oct 2020 23:00:37 +0200 Subject: [PATCH 2/4] brew reinstall lz4; purge /tmp/openmw-deps just in case --- CI/before_install.osx.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh index 28acae13cc..c6cf797e04 100755 --- a/CI/before_install.osx.sh +++ b/CI/before_install.osx.sh @@ -4,7 +4,8 @@ command -v ccache >/dev/null 2>&1 || brew install ccache command -v cmake >/dev/null 2>&1 || brew install cmake command -v qmake >/dev/null 2>&1 || brew install qt -command -v lz4 >/dev/null 2>&1 || brew install lz4 +brew reinstall lz4 curl -fSL -R -J https://downloads.openmw.org/osx/dependencies/openmw-deps-ef2462c.zip -o ~/openmw-deps.zip +rm -fr /tmp/openmw-deps unzip -o ~/openmw-deps.zip -d /private/tmp/openmw-deps > /dev/null From 8b5aa4c00151ad8908f95b1517ddb3bb7e3553ca Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Tue, 20 Oct 2020 23:06:08 +0200 Subject: [PATCH 3/4] try for link overwriting --- CI/before_install.osx.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh index c6cf797e04..5285e4e9a6 100755 --- a/CI/before_install.osx.sh +++ b/CI/before_install.osx.sh @@ -4,6 +4,8 @@ command -v ccache >/dev/null 2>&1 || brew install ccache command -v cmake >/dev/null 2>&1 || brew install cmake command -v qmake >/dev/null 2>&1 || brew install qt +brew link --overwrite --dry-run lz4 +brew link --overwrite lz4 brew reinstall lz4 curl -fSL -R -J https://downloads.openmw.org/osx/dependencies/openmw-deps-ef2462c.zip -o ~/openmw-deps.zip From 06689cfe2a0f627058cc95fd5c3dacbc144ddbfb Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Tue, 20 Oct 2020 23:22:37 +0200 Subject: [PATCH 4/4] bingo; cleanup --- CI/before_install.osx.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh index 5285e4e9a6..fd77e06936 100755 --- a/CI/before_install.osx.sh +++ b/CI/before_install.osx.sh @@ -4,10 +4,9 @@ command -v ccache >/dev/null 2>&1 || brew install ccache command -v cmake >/dev/null 2>&1 || brew install cmake command -v qmake >/dev/null 2>&1 || brew install qt -brew link --overwrite --dry-run lz4 -brew link --overwrite lz4 + +brew link --overwrite lz4 # overwrite system lz4; use brew brew reinstall lz4 curl -fSL -R -J https://downloads.openmw.org/osx/dependencies/openmw-deps-ef2462c.zip -o ~/openmw-deps.zip -rm -fr /tmp/openmw-deps unzip -o ~/openmw-deps.zip -d /private/tmp/openmw-deps > /dev/null