Merge pull request #208 from radarhere/untar

Updated multibuild
This commit is contained in:
Hugo van Kemenade 2021-07-02 22:57:01 +03:00 committed by GitHub
commit eb0b407724
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 21 deletions

View File

@ -18,26 +18,13 @@ LIBWEBP_VERSION=1.2.0
BZIP2_VERSION=1.0.8 BZIP2_VERSION=1.0.8
LIBXCB_VERSION=1.14 LIBXCB_VERSION=1.14
# workaround for multibuild bug with .tar.xz function pyinst_fname_for_version {
function untar { local inst_ext=$(pyinst_ext_for_version $1)
local in_fname=$1 if [ "${PLAT:-}" == "arm64" ]; then
if [ -z "$in_fname" ];then echo "in_fname not defined"; exit 1; fi echo "python-$1-macos11.${inst_ext}"
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 else
if [[ ! $(type -P "unxz") ]]; then echo "python-$1-macosx$2.${inst_ext}"
echo xz must be installed to uncompress file; exit 1
fi fi
unxz -c $in_fname | tar -xf -
fi ;;
*) echo Did not recognize extension $extension; exit 1 ;;
esac
} }
function pre_build { function pre_build {

@ -1 +1 @@
Subproject commit 125a047dfd81f6d22815f91cae8cdef1f81f02ac Subproject commit a980404f76f9491828391a79b1e37bf561988467