From 249728197ef465a1297c4a4c6c8aacce7888982c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ondrej=20Baranovi=C4=8D?= Date: Thu, 3 Feb 2022 15:10:34 +0100 Subject: [PATCH 1/2] brew remove libxcb libxdmcp --- .github/workflows/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.sh b/.github/workflows/build.sh index d3ece68d7..c3087c585 100755 --- a/.github/workflows/build.sh +++ b/.github/workflows/build.sh @@ -1,9 +1,9 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - # webp, zstd, xz, libtiff cause a conflict with building webp and libtiff + # webp, zstd, xz, libtiff, libxcb, libxdmcp cause a conflict with building webp, libtiff, libxcb # curl from brew requires zstd, use system curl # if php is installed, brew tries to reinstall these after installing openblas - brew remove --ignore-dependencies webp zstd xz libtiff curl php + brew remove --ignore-dependencies webp zstd xz libtiff libxcb libxdmcp curl php fi if [[ "$MB_PYTHON_VERSION" == pypy3* ]]; then From a1543bcdad3c0d44b70d780a2b12451a9ed22a29 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 4 Feb 2022 11:32:55 +1100 Subject: [PATCH 2/2] Do not remove libxdmcp --- .github/workflows/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.sh b/.github/workflows/build.sh index c3087c585..51644e260 100755 --- a/.github/workflows/build.sh +++ b/.github/workflows/build.sh @@ -1,9 +1,9 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - # webp, zstd, xz, libtiff, libxcb, libxdmcp cause a conflict with building webp, libtiff, libxcb + # webp, zstd, xz, libtiff, libxcb cause a conflict with building webp, libtiff, libxcb # curl from brew requires zstd, use system curl # if php is installed, brew tries to reinstall these after installing openblas - brew remove --ignore-dependencies webp zstd xz libtiff libxcb libxdmcp curl php + brew remove --ignore-dependencies webp zstd xz libtiff libxcb curl php fi if [[ "$MB_PYTHON_VERSION" == pypy3* ]]; then