From 9794b8a6042e5b3557807f3c5d1628638f0c5126 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sat, 11 Jun 2022 07:52:36 +0200 Subject: [PATCH] setuptools: revert switch to PEP517 this makes bootstrapping too complicated --- mingw-w64-python-setuptools/PKGBUILD | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/mingw-w64-python-setuptools/PKGBUILD b/mingw-w64-python-setuptools/PKGBUILD index 00ee696f5f..9de2b05bd2 100644 --- a/mingw-w64-python-setuptools/PKGBUILD +++ b/mingw-w64-python-setuptools/PKGBUILD @@ -9,7 +9,7 @@ conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}" "${MINGW_PACKAGE_PREFIX}-python2-setuptools<42.0.2") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=59.8.0 -pkgrel=3 +pkgrel=4 pkgdesc="Easily download, build, install, upgrade, and uninstall Python packages (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') @@ -20,8 +20,6 @@ optdepends=("${MINGW_PACKAGE_PREFIX}-python-certifi: Mozilla's CA Bundle support "${MINGW_PACKAGE_PREFIX}-python-wincertstore: Windows' cert store support") makedepends=( "${MINGW_PACKAGE_PREFIX}-cc" - "${MINGW_PACKAGE_PREFIX}-python-installer" - "${MINGW_PACKAGE_PREFIX}-python-build" "${MINGW_PACKAGE_PREFIX}-python-wheel" ) source=(${_realname}-${pkgver}.tar.gz::https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz @@ -104,7 +102,7 @@ build() { ;; esac - python -m build --wheel --skip-dependency-check --no-isolation + python setup.py build } check() { @@ -116,8 +114,8 @@ check() { package() { cd "${srcdir}/setuptools-python-${CARCH}" - MSYS2_ARG_CONV_EXCL="--prefix=" \ - python -m installer --prefix=${MINGW_PREFIX} --destdir="${pkgdir}" dist/*.whl + MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ + python setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" --optimize=1 --skip-build install -Dm644 ${srcdir}/${_realname}-${pkgver}/LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE }