From 702da87d3fd403ef2f39e6703857ed6436a6318b Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 5 Sep 2020 19:49:39 +1000 Subject: [PATCH 1/2] Revert "Workaround problems with cmake and xz on manylinux2014" This reverts commit 639793e150a6c5f1968f32271660a7c8326ccb20. --- config.sh | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/config.sh b/config.sh index 59cb8637b..17e64542b 100644 --- a/config.sh +++ b/config.sh @@ -25,16 +25,6 @@ function pre_build { if [ -n "$IS_OSX" ]; then # Update to latest zlib for OS X build build_new_zlib - elif [ $MB_ML_VER -eq 2014 ]; then - yum install -y cmake - - function get_cmake { - echo cmake - } - - function build_xz { - yum install -y xz-devel - } fi if [ -n "$IS_OSX" ]; then From dd82901ec7e1b7cd3877195f4218d89398eed155 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 5 Sep 2020 19:51:40 +1000 Subject: [PATCH 2/2] Updated multibuild --- multibuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multibuild b/multibuild index d1252d15e..c395b10e8 160000 --- a/multibuild +++ b/multibuild @@ -1 +1 @@ -Subproject commit d1252d15e95712700865fe4a3e7c20f978efba03 +Subproject commit c395b10e8395d43b51209760dc0853303ecfcd9e