From 113eecfa22aa69655b73a177cc50dd0f5306ae5c Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 2 Jul 2021 18:13:22 +1000 Subject: [PATCH] Removed multibuild workaround --- config.sh | 22 ---------------------- multibuild | 2 +- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/config.sh b/config.sh index 31d1c8385..71017f664 100644 --- a/config.sh +++ b/config.sh @@ -18,28 +18,6 @@ LIBWEBP_VERSION=1.2.0 BZIP2_VERSION=1.0.8 LIBXCB_VERSION=1.14 -# workaround for multibuild bug with .tar.xz -function untar { - local in_fname=$1 - if [ -z "$in_fname" ];then echo "in_fname not defined"; exit 1; fi - local extension=${in_fname##*.} - case $extension in - tar) tar -xf $in_fname ;; - gz|tgz) tar -zxf $in_fname ;; - bz2) tar -jxf $in_fname ;; - zip) unzip -qq $in_fname ;; - xz) if [ -n "$IS_MACOS" ]; then - tar -xf $in_fname - else - if [[ ! $(type -P "unxz") ]]; then - echo xz must be installed to uncompress file; exit 1 - fi - unxz -c $in_fname | tar -xf - - fi ;; - *) echo Did not recognize extension $extension; exit 1 ;; - esac -} - function pre_build { # Any stuff that you need to do before you start building the wheels # Runs in the root directory of this repository. diff --git a/multibuild b/multibuild index 125a047df..a980404f7 160000 --- a/multibuild +++ b/multibuild @@ -1 +1 @@ -Subproject commit 125a047dfd81f6d22815f91cae8cdef1f81f02ac +Subproject commit a980404f76f9491828391a79b1e37bf561988467