From cad18bb332c58ad52c4a1d8bc5de70a034a2bab0 Mon Sep 17 00:00:00 2001 From: Dan Dees Date: Mon, 5 Dec 2022 23:00:32 +0300 Subject: [PATCH] Add PyPy 7.3.10 --- plugins/python-build/bin/python-build | 8 +- .../share/python-build/pypy2.7-7.3.10 | 81 +++++++++++++++++++ .../share/python-build/pypy2.7-7.3.10-src | 14 ++++ .../share/python-build/pypy2.7-7.3.9 | 54 ++++++------- .../share/python-build/pypy3.7-7.3.9 | 54 ++++++------- .../share/python-build/pypy3.8-7.3.10 | 81 +++++++++++++++++++ .../share/python-build/pypy3.8-7.3.10-src | 14 ++++ .../share/python-build/pypy3.8-7.3.9 | 54 ++++++------- .../share/python-build/pypy3.9-7.3.10 | 81 +++++++++++++++++++ .../share/python-build/pypy3.9-7.3.10-src | 14 ++++ .../share/python-build/pypy3.9-7.3.9 | 54 ++++++------- 11 files changed, 400 insertions(+), 109 deletions(-) create mode 100644 plugins/python-build/share/python-build/pypy2.7-7.3.10 create mode 100644 plugins/python-build/share/python-build/pypy2.7-7.3.10-src create mode 100644 plugins/python-build/share/python-build/pypy3.8-7.3.10 create mode 100644 plugins/python-build/share/python-build/pypy3.8-7.3.10-src create mode 100644 plugins/python-build/share/python-build/pypy3.9-7.3.10 create mode 100644 plugins/python-build/share/python-build/pypy3.9-7.3.10-src diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build index 797ab75f..7fc9004e 100755 --- a/plugins/python-build/bin/python-build +++ b/plugins/python-build/bin/python-build @@ -940,7 +940,13 @@ build_package_micropython() { pypy_architecture() { case "$(uname -s)" in - "Darwin" ) echo "osx64" ;; + "Darwin" ) + case "$(uname -m)" in + "arm64" ) echo "osarm64" ;; + "x86_64" ) echo "osx64" ;; + * ) return 1 ;; + esac + ;; "Linux" ) case "$(uname -m)" in "armel" ) echo "linux-armel" ;; diff --git a/plugins/python-build/share/python-build/pypy2.7-7.3.10 b/plugins/python-build/share/python-build/pypy2.7-7.3.10 new file mode 100644 index 00000000..378ccd2c --- /dev/null +++ b/plugins/python-build/share/python-build/pypy2.7-7.3.10 @@ -0,0 +1,81 @@ +VERSION='7.3.10' +PYVER='2.7' + +# https://www.pypy.org/checksums.html +aarch64_hash=274342f0e75e99d60ba7a0cfb0e13792e7664163e01450d2f7f2f7825603a0ae +linux32_hash=0b17132f62d2a0c3c4572c57eb53820f25611afad71f3d6a310202942baed6e1 +linux64_hash=461fb6df524208af9e94ffb16989f628b585bdb4b9e97d81e668899fc3a064a3 +osarm64_hash=14b178f005603e3df6db7574b77b9c65ae79feda1a629214cafcb4eee7da679d +osx64_hash=188551185ee945d5e42a3a619205d02ac31db77bdd5d98b6c11469e125c3bdb5 +s390x_hash=0fac1ec1e05c70941f758be05d40ce7ffe6a42c0416e70b55d40a7523e3e70ae + +### end of manual settings - following lines same for every download + +function err_no_binary { + local archmsg="${1}" + local ver="pypy${PYVER}-v${VERSION}-src" + local url="https://downloads.python.org/pypy/${ver}.tar.bz2" + { echo + colorize 1 "ERROR" + echo ": The binary distribution of PyPy is not available for ${archmsg}." + echo "try '${url}' to build from source." + echo + } >&2 + exit 1 +} + +function pypy_pkg_data { + # pypy architecture tag + local ARCH="${1}" + + # defaults + local cmd='install_package' # use bz2 + local pkg="${ARCH}" # assume matches + local ext='tar.bz2' + local hash='' # undefined + + # select the hash, fix pkg if not match ARCH + case "${ARCH}" in + 'linux-aarch64' ) + hash="${aarch64_hash}" + pkg='aarch64' + ;; + 'linux' ) + hash="${linux32_hash}" + pkg='linux32' + ;; + 'linux64' ) + hash="${linux64_hash}" + ;; + 'osarm64' ) + hash="${osarm64_hash}" + pkg='macos_arm64' + ;; + 'osx64' ) + if require_osx_version "10.13"; then + hash="${osx64_hash}" + pkg='macos_x86_64' + else + err_no_binary "${ARCH}, OS X < 10.13" + fi + ;; + 's390x' ) + hash="${s390x_hash}" + ;; + * ) + err_no_binary "${ARCH}" + ;; + esac + + local basever="pypy${PYVER}-v${VERSION}" + local baseurl="https://downloads.python.org/pypy/${basever}" + + # result - command, package dir, url+hash + echo "${cmd}" "${basever}-${pkg}" "${baseurl}-${pkg}.${ext}#${hash}" +} + +# determine command, package directory, url+hash +declare -a pd="$(pypy_pkg_data "$(pypy_architecture 2>/dev/null || true)")" + +# install +${pd[0]} "${pd[1]}" "${pd[2]}" 'pypy' "verify_py${PYVER//./}" 'ensurepip' diff --git a/plugins/python-build/share/python-build/pypy2.7-7.3.10-src b/plugins/python-build/share/python-build/pypy2.7-7.3.10-src new file mode 100644 index 00000000..2b638e21 --- /dev/null +++ b/plugins/python-build/share/python-build/pypy2.7-7.3.10-src @@ -0,0 +1,14 @@ +VERSION='7.3.10' +PYVER='2.7' + +# https://www.pypy.org/checksums.html +hash=35e2cf4519cb51c4d5ffb4493ee24f0c7f42b4b04944903ca4b33981a04a3bc5 + +### end of manual settings - following lines same for every download + +ver="pypy${PYVER}-v${VERSION}-src" +url="https://downloads.python.org/pypy/${ver}.tar.bz2" + +prefer_openssl11 +install_package "openssl-1.1.1f" "https://www.openssl.org/source/openssl-1.1.1f.tar.gz#186c6bfe6ecfba7a5b48c47f8a1673d0f3b0e5ba2e25602dd23b629975da3f35" mac_openssl --if has_broken_mac_openssl +install_package "${ver}" "${url}#${hash}" 'pypy_builder' "verify_py${PYVER//./}" 'ensurepip' diff --git a/plugins/python-build/share/python-build/pypy2.7-7.3.9 b/plugins/python-build/share/python-build/pypy2.7-7.3.9 index 99cfd12c..46069676 100644 --- a/plugins/python-build/share/python-build/pypy2.7-7.3.9 +++ b/plugins/python-build/share/python-build/pypy2.7-7.3.9 @@ -11,29 +11,38 @@ win64_hash=ca7b0f4c576995b388cfb4c796e3f6f20b037e5314571bf267daa068a3a2af31 ### end of manual settings - following lines same for every download -function pypy_pkg_data { - # pypy architecture - local ARCH="${1}" +function err_no_binary { + local archmsg="${1}" + local ver="pypy${PYVER}-v${VERSION}-src" + local url="https://downloads.python.org/pypy/${ver}.tar.bz2" + { echo + colorize 1 "ERROR" + echo ": The binary distribution of PyPy is not available for ${archmsg}." + echo "try '${url}' to build from source." + echo + } >&2 + exit 1 +} - local basesrc="pypy${PYVER}-${VERSION}-src" - local basever="pypy${PYVER}-v${VERSION}" - local baseurl="https://downloads.python.org/pypy/${basever}" +function pypy_pkg_data { + # pypy architecture tag + local ARCH="${1}" # defaults local cmd='install_package' # use bz2 local pkg="${ARCH}" # assume matches - local url="${baseurl}-${pkg}.tar.bz2" # use bz2 + local ext='tar.bz2' # windows is always diff... local hash='' # undefined - case "${pkg}" in + # select the hash, fix pkg if not match ARCH, windows has ext of zip + case "${ARCH}" in 'linux-aarch64' ) hash="${aarch64_hash}" - url="${baseurl}-aarch64.tar.bz2" # diff url + pkg='aarch64' ;; 'linux' ) hash="${linux32_hash}" - pkg='linux32' # package name revised - url="${baseurl}-${pkg}.tar.bz2" # new url + pkg='linux32' ;; 'linux64' ) hash="${linux64_hash}" @@ -42,13 +51,7 @@ function pypy_pkg_data { if require_osx_version "10.13"; then hash="${osx64_hash}" else - { echo - colorize 1 "ERROR" - echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true), OS X < 10.13." - echo "try '${basesrc}' to build from source." - echo - } >&2 - exit 1 + err_no_binary "${ARCH}, OS X < 10.13" fi ;; 's390x' ) @@ -57,21 +60,18 @@ function pypy_pkg_data { 'win64' ) hash="${win64_hash}" cmd='install_zip' # diff command - url="${baseurl}-${pkg}.zip" # zip rather than bz2 + ext='zip' # zip rather than bz2 ;; * ) - { echo - colorize 1 "ERROR" - echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)." - echo "try '${basesrc}' to build from source." - echo - } >&2 - exit 1 + err_no_binary "${ARCH}" ;; esac + local basever="pypy${PYVER}-v${VERSION}" + local baseurl="https://downloads.python.org/pypy/${basever}" + # result - command, package dir, url+hash - echo "${cmd}" "${basever}-${pkg}" "${url}#${hash}" + echo "${cmd}" "${basever}-${pkg}" "${baseurl}-${pkg}.${ext}#${hash}" } # determine command, package directory, url+hash diff --git a/plugins/python-build/share/python-build/pypy3.7-7.3.9 b/plugins/python-build/share/python-build/pypy3.7-7.3.9 index 83f2455c..d38cff19 100644 --- a/plugins/python-build/share/python-build/pypy3.7-7.3.9 +++ b/plugins/python-build/share/python-build/pypy3.7-7.3.9 @@ -11,29 +11,38 @@ win64_hash=8acb184b48fb3c854de0662e4d23a66b90e73b1ab73a86695022c12c745d8b00 ### end of manual settings - following lines same for every download -function pypy_pkg_data { - # pypy architecture - local ARCH="${1}" +function err_no_binary { + local archmsg="${1}" + local ver="pypy${PYVER}-v${VERSION}-src" + local url="https://downloads.python.org/pypy/${ver}.tar.bz2" + { echo + colorize 1 "ERROR" + echo ": The binary distribution of PyPy is not available for ${archmsg}." + echo "try '${url}' to build from source." + echo + } >&2 + exit 1 +} - local basesrc="pypy${PYVER}-${VERSION}-src" - local basever="pypy${PYVER}-v${VERSION}" - local baseurl="https://downloads.python.org/pypy/${basever}" +function pypy_pkg_data { + # pypy architecture tag + local ARCH="${1}" # defaults local cmd='install_package' # use bz2 local pkg="${ARCH}" # assume matches - local url="${baseurl}-${pkg}.tar.bz2" # use bz2 + local ext='tar.bz2' # windows is always diff... local hash='' # undefined - case "${pkg}" in + # select the hash, fix pkg if not match ARCH, windows has ext of zip + case "${ARCH}" in 'linux-aarch64' ) hash="${aarch64_hash}" - url="${baseurl}-aarch64.tar.bz2" # diff url + pkg='aarch64' ;; 'linux' ) hash="${linux32_hash}" - pkg='linux32' # package name revised - url="${baseurl}-${pkg}.tar.bz2" # new url + pkg='linux32' ;; 'linux64' ) hash="${linux64_hash}" @@ -42,13 +51,7 @@ function pypy_pkg_data { if require_osx_version "10.13"; then hash="${osx64_hash}" else - { echo - colorize 1 "ERROR" - echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true), OS X < 10.13." - echo "try '${basesrc}' to build from source." - echo - } >&2 - exit 1 + err_no_binary "${ARCH}, OS X < 10.13" fi ;; 's390x' ) @@ -57,21 +60,18 @@ function pypy_pkg_data { 'win64' ) hash="${win64_hash}" cmd='install_zip' # diff command - url="${baseurl}-${pkg}.zip" # zip rather than bz2 + ext='zip' # zip rather than bz2 ;; * ) - { echo - colorize 1 "ERROR" - echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)." - echo "try '${basesrc}' to build from source." - echo - } >&2 - exit 1 + err_no_binary "${ARCH}" ;; esac + local basever="pypy${PYVER}-v${VERSION}" + local baseurl="https://downloads.python.org/pypy/${basever}" + # result - command, package dir, url+hash - echo "${cmd}" "${basever}-${pkg}" "${url}#${hash}" + echo "${cmd}" "${basever}-${pkg}" "${baseurl}-${pkg}.${ext}#${hash}" } # determine command, package directory, url+hash diff --git a/plugins/python-build/share/python-build/pypy3.8-7.3.10 b/plugins/python-build/share/python-build/pypy3.8-7.3.10 new file mode 100644 index 00000000..6877e301 --- /dev/null +++ b/plugins/python-build/share/python-build/pypy3.8-7.3.10 @@ -0,0 +1,81 @@ +VERSION='7.3.10' +PYVER='3.8' + +# https://www.pypy.org/checksums.html +aarch64_hash=e4caa1a545f22cfee87d5b9aa6f8852347f223643ad7d2562e0b2a2f4663ad98 +linux32_hash=b70ed7fdc73a74ebdc04f07439f7bad1a849aaca95e26b4a74049d0e483f071c +linux64_hash=ceef6496fd4ab1c99e3ec22ce657b8f10f8bb77a32427fadfb5e1dd943806011 +osarm64_hash=6cb1429371e4854b718148a509d80143f801e3abfc72fef58d88aeeee1e98f9e +osx64_hash=399eb1ce4c65f62f6a096b7c273536601b7695e3c0dc0457393a659b95b7615b +s390x_hash=c294f8e815158388628fe77ac5b8ad6cd93c8db1359091fa02d41cf6da4d61a1 + +### end of manual settings - following lines same for every download + +function err_no_binary { + local archmsg="${1}" + local ver="pypy${PYVER}-v${VERSION}-src" + local url="https://downloads.python.org/pypy/${ver}.tar.bz2" + { echo + colorize 1 "ERROR" + echo ": The binary distribution of PyPy is not available for ${archmsg}." + echo "try '${url}' to build from source." + echo + } >&2 + exit 1 +} + +function pypy_pkg_data { + # pypy architecture tag + local ARCH="${1}" + + # defaults + local cmd='install_package' # use bz2 + local pkg="${ARCH}" # assume matches + local ext='tar.bz2' + local hash='' # undefined + + # select the hash, fix pkg if not match ARCH + case "${ARCH}" in + 'linux-aarch64' ) + hash="${aarch64_hash}" + pkg='aarch64' + ;; + 'linux' ) + hash="${linux32_hash}" + pkg='linux32' + ;; + 'linux64' ) + hash="${linux64_hash}" + ;; + 'osarm64' ) + hash="${osarm64_hash}" + pkg='macos_arm64' + ;; + 'osx64' ) + if require_osx_version "10.13"; then + hash="${osx64_hash}" + pkg='macos_x86_64' + else + err_no_binary "${ARCH}, OS X < 10.13" + fi + ;; + 's390x' ) + hash="${s390x_hash}" + ;; + * ) + err_no_binary "${ARCH}" + ;; + esac + + local basever="pypy${PYVER}-v${VERSION}" + local baseurl="https://downloads.python.org/pypy/${basever}" + + # result - command, package dir, url+hash + echo "${cmd}" "${basever}-${pkg}" "${baseurl}-${pkg}.${ext}#${hash}" +} + +# determine command, package directory, url+hash +declare -a pd="$(pypy_pkg_data "$(pypy_architecture 2>/dev/null || true)")" + +# install +${pd[0]} "${pd[1]}" "${pd[2]}" 'pypy' "verify_py${PYVER//./}" 'ensurepip' diff --git a/plugins/python-build/share/python-build/pypy3.8-7.3.10-src b/plugins/python-build/share/python-build/pypy3.8-7.3.10-src new file mode 100644 index 00000000..5530b660 --- /dev/null +++ b/plugins/python-build/share/python-build/pypy3.8-7.3.10-src @@ -0,0 +1,14 @@ +VERSION='7.3.10' +PYVER='3.8' + +# https://www.pypy.org/checksums.html +hash=218a1e062f17aba89f61bc398e8498f13c048b9fcf294343f5d9d56c3ac9b882 + +### end of manual settings - following lines same for every download + +ver="pypy${PYVER}-v${VERSION}-src" +url="https://downloads.python.org/pypy/${ver}.tar.bz2" + +prefer_openssl11 +install_package "openssl-1.1.1f" "https://www.openssl.org/source/openssl-1.1.1f.tar.gz#186c6bfe6ecfba7a5b48c47f8a1673d0f3b0e5ba2e25602dd23b629975da3f35" mac_openssl --if has_broken_mac_openssl +install_package "${ver}" "${url}#${hash}" 'pypy_builder' "verify_py${PYVER//./}" 'ensurepip' diff --git a/plugins/python-build/share/python-build/pypy3.8-7.3.9 b/plugins/python-build/share/python-build/pypy3.8-7.3.9 index 5b908ae8..168a9536 100644 --- a/plugins/python-build/share/python-build/pypy3.8-7.3.9 +++ b/plugins/python-build/share/python-build/pypy3.8-7.3.9 @@ -11,29 +11,38 @@ win64_hash=05022baaa55db2b60880f2422312d9e4025e1267303ac57f33e8253559d0be88 ### end of manual settings - following lines same for every download -function pypy_pkg_data { - # pypy architecture - local ARCH="${1}" +function err_no_binary { + local archmsg="${1}" + local ver="pypy${PYVER}-v${VERSION}-src" + local url="https://downloads.python.org/pypy/${ver}.tar.bz2" + { echo + colorize 1 "ERROR" + echo ": The binary distribution of PyPy is not available for ${archmsg}." + echo "try '${url}' to build from source." + echo + } >&2 + exit 1 +} - local basesrc="pypy${PYVER}-${VERSION}-src" - local basever="pypy${PYVER}-v${VERSION}" - local baseurl="https://downloads.python.org/pypy/${basever}" +function pypy_pkg_data { + # pypy architecture tag + local ARCH="${1}" # defaults local cmd='install_package' # use bz2 local pkg="${ARCH}" # assume matches - local url="${baseurl}-${pkg}.tar.bz2" # use bz2 + local ext='tar.bz2' # windows is always diff... local hash='' # undefined - case "${pkg}" in + # select the hash, fix pkg if not match ARCH, windows has ext of zip + case "${ARCH}" in 'linux-aarch64' ) hash="${aarch64_hash}" - url="${baseurl}-aarch64.tar.bz2" # diff url + pkg='aarch64' ;; 'linux' ) hash="${linux32_hash}" - pkg='linux32' # package name revised - url="${baseurl}-${pkg}.tar.bz2" # new url + pkg='linux32' ;; 'linux64' ) hash="${linux64_hash}" @@ -42,13 +51,7 @@ function pypy_pkg_data { if require_osx_version "10.13"; then hash="${osx64_hash}" else - { echo - colorize 1 "ERROR" - echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true), OS X < 10.13." - echo "try '${basesrc}' to build from source." - echo - } >&2 - exit 1 + err_no_binary "${ARCH}, OS X < 10.13" fi ;; 's390x' ) @@ -57,21 +60,18 @@ function pypy_pkg_data { 'win64' ) hash="${win64_hash}" cmd='install_zip' # diff command - url="${baseurl}-${pkg}.zip" # zip rather than bz2 + ext='zip' # zip rather than bz2 ;; * ) - { echo - colorize 1 "ERROR" - echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)." - echo "try '${basesrc}' to build from source." - echo - } >&2 - exit 1 + err_no_binary "${ARCH}" ;; esac + local basever="pypy${PYVER}-v${VERSION}" + local baseurl="https://downloads.python.org/pypy/${basever}" + # result - command, package dir, url+hash - echo "${cmd}" "${basever}-${pkg}" "${url}#${hash}" + echo "${cmd}" "${basever}-${pkg}" "${baseurl}-${pkg}.${ext}#${hash}" } # determine command, package directory, url+hash diff --git a/plugins/python-build/share/python-build/pypy3.9-7.3.10 b/plugins/python-build/share/python-build/pypy3.9-7.3.10 new file mode 100644 index 00000000..9810b2a6 --- /dev/null +++ b/plugins/python-build/share/python-build/pypy3.9-7.3.10 @@ -0,0 +1,81 @@ +VERSION='7.3.10' +PYVER='3.9' + +# https://www.pypy.org/checksums.html +aarch64_hash=657a04fd9a5a992a2f116a9e7e9132ea0c578721f59139c9fb2083775f71e514 +linux32_hash=b6db59613b9a1c0c1ab87bc103f52ee95193423882dc8a848b68850b8ba59cc5 +linux64_hash=95cf99406179460d63ddbfe1ec870f889d05f7767ce81cef14b88a3a9e127266 +osarm64_hash=e2a6bec7408e6497c7de8165aa4a1b15e2416aec4a72f2578f793fb06859ccba +osx64_hash=f90c8619b41e68ec9ffd7d5e913fe02e60843da43d3735b1c1bc75bcfe638d97 +s390x_hash=ca6525a540cf0c682d1592ae35d3fbc97559a97260e4b789255cc76dde7a14f0 + +### end of manual settings - following lines same for every download + +function err_no_binary { + local archmsg="${1}" + local ver="pypy${PYVER}-v${VERSION}-src" + local url="https://downloads.python.org/pypy/${ver}.tar.bz2" + { echo + colorize 1 "ERROR" + echo ": The binary distribution of PyPy is not available for ${archmsg}." + echo "try '${url}' to build from source." + echo + } >&2 + exit 1 +} + +function pypy_pkg_data { + # pypy architecture tag + local ARCH="${1}" + + # defaults + local cmd='install_package' # use bz2 + local pkg="${ARCH}" # assume matches + local ext='tar.bz2' + local hash='' # undefined + + # select the hash, fix pkg if not match ARCH + case "${ARCH}" in + 'linux-aarch64' ) + hash="${aarch64_hash}" + pkg='aarch64' + ;; + 'linux' ) + hash="${linux32_hash}" + pkg='linux32' + ;; + 'linux64' ) + hash="${linux64_hash}" + ;; + 'osarm64' ) + hash="${osarm64_hash}" + pkg='macos_arm64' + ;; + 'osx64' ) + if require_osx_version "10.13"; then + hash="${osx64_hash}" + pkg='macos_x86_64' + else + err_no_binary "${ARCH}, OS X < 10.13" + fi + ;; + 's390x' ) + hash="${s390x_hash}" + ;; + * ) + err_no_binary "${ARCH}" + ;; + esac + + local basever="pypy${PYVER}-v${VERSION}" + local baseurl="https://downloads.python.org/pypy/${basever}" + + # result - command, package dir, url+hash + echo "${cmd}" "${basever}-${pkg}" "${baseurl}-${pkg}.${ext}#${hash}" +} + +# determine command, package directory, url+hash +declare -a pd="$(pypy_pkg_data "$(pypy_architecture 2>/dev/null || true)")" + +# install +${pd[0]} "${pd[1]}" "${pd[2]}" 'pypy' "verify_py${PYVER//./}" 'ensurepip' diff --git a/plugins/python-build/share/python-build/pypy3.9-7.3.10-src b/plugins/python-build/share/python-build/pypy3.9-7.3.10-src new file mode 100644 index 00000000..ef4c5f30 --- /dev/null +++ b/plugins/python-build/share/python-build/pypy3.9-7.3.10-src @@ -0,0 +1,14 @@ +VERSION='7.3.10' +PYVER='3.9' + +# https://www.pypy.org/checksums.html +hash=3738d32575ed2513e3e66878e4e4c6c208caed267570f3f9f814748830002967 + +### end of manual settings - following lines same for every download + +ver="pypy${PYVER}-v${VERSION}-src" +url="https://downloads.python.org/pypy/${ver}.tar.bz2" + +prefer_openssl11 +install_package "openssl-1.1.1f" "https://www.openssl.org/source/openssl-1.1.1f.tar.gz#186c6bfe6ecfba7a5b48c47f8a1673d0f3b0e5ba2e25602dd23b629975da3f35" mac_openssl --if has_broken_mac_openssl +install_package "${ver}" "${url}#${hash}" 'pypy_builder' "verify_py${PYVER//./}" 'ensurepip' diff --git a/plugins/python-build/share/python-build/pypy3.9-7.3.9 b/plugins/python-build/share/python-build/pypy3.9-7.3.9 index ec2df704..a59ee362 100644 --- a/plugins/python-build/share/python-build/pypy3.9-7.3.9 +++ b/plugins/python-build/share/python-build/pypy3.9-7.3.9 @@ -11,29 +11,38 @@ win64_hash=be48ab42f95c402543a7042c999c9433b17e55477c847612c8733a583ca6dff5 ### end of manual settings - following lines same for every download -function pypy_pkg_data { - # pypy architecture - local ARCH="${1}" +function err_no_binary { + local archmsg="${1}" + local ver="pypy${PYVER}-v${VERSION}-src" + local url="https://downloads.python.org/pypy/${ver}.tar.bz2" + { echo + colorize 1 "ERROR" + echo ": The binary distribution of PyPy is not available for ${archmsg}." + echo "try '${url}' to build from source." + echo + } >&2 + exit 1 +} - local basesrc="pypy${PYVER}-${VERSION}-src" - local basever="pypy${PYVER}-v${VERSION}" - local baseurl="https://downloads.python.org/pypy/${basever}" +function pypy_pkg_data { + # pypy architecture tag + local ARCH="${1}" # defaults local cmd='install_package' # use bz2 local pkg="${ARCH}" # assume matches - local url="${baseurl}-${pkg}.tar.bz2" # use bz2 + local ext='tar.bz2' # windows is always diff... local hash='' # undefined - case "${pkg}" in + # select the hash, fix pkg if not match ARCH, windows has ext of zip + case "${ARCH}" in 'linux-aarch64' ) hash="${aarch64_hash}" - url="${baseurl}-aarch64.tar.bz2" # diff url + pkg='aarch64' ;; 'linux' ) hash="${linux32_hash}" - pkg='linux32' # package name revised - url="${baseurl}-${pkg}.tar.bz2" # new url + pkg='linux32' ;; 'linux64' ) hash="${linux64_hash}" @@ -42,13 +51,7 @@ function pypy_pkg_data { if require_osx_version "10.13"; then hash="${osx64_hash}" else - { echo - colorize 1 "ERROR" - echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true), OS X < 10.13." - echo "try '${basesrc}' to build from source." - echo - } >&2 - exit 1 + err_no_binary "${ARCH}, OS X < 10.13" fi ;; 's390x' ) @@ -57,21 +60,18 @@ function pypy_pkg_data { 'win64' ) hash="${win64_hash}" cmd='install_zip' # diff command - url="${baseurl}-${pkg}.zip" # zip rather than bz2 + ext='zip' # zip rather than bz2 ;; * ) - { echo - colorize 1 "ERROR" - echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)." - echo "try '${basesrc}' to build from source." - echo - } >&2 - exit 1 + err_no_binary "${ARCH}" ;; esac + local basever="pypy${PYVER}-v${VERSION}" + local baseurl="https://downloads.python.org/pypy/${basever}" + # result - command, package dir, url+hash - echo "${cmd}" "${basever}-${pkg}" "${url}#${hash}" + echo "${cmd}" "${basever}-${pkg}" "${baseurl}-${pkg}.${ext}#${hash}" } # determine command, package directory, url+hash