From 45d38df09320668a85854c2646b8d7eb3667ab59 Mon Sep 17 00:00:00 2001 From: OscarL Date: Wed, 7 Jun 2023 06:00:46 -0300 Subject: [PATCH] lazy_object_proxy: recipe cleanup. (#8811) * Build with build/installer. * Provide "non _x86" package name. --- .../lazy_object_proxy-1.5.2.recipe | 35 +++++++++++-------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/dev-python/lazy-object-proxy/lazy_object_proxy-1.5.2.recipe b/dev-python/lazy-object-proxy/lazy_object_proxy-1.5.2.recipe index e35db834b..fb44c0fc3 100644 --- a/dev-python/lazy-object-proxy/lazy_object_proxy-1.5.2.recipe +++ b/dev-python/lazy-object-proxy/lazy_object_proxy-1.5.2.recipe @@ -6,7 +6,7 @@ to the target object" HOMEPAGE="https://github.com/ionelmc/python-lazy-object-proxy" COPYRIGHT="2014-2019, Ionel Cristian Mărieș" LICENSE="BSD (2-clause)" -REVISION="3" +REVISION="4" SOURCE_URI="https://github.com/ionelmc/python-lazy-object-proxy/archive/v$portVersion.tar.gz" CHECKSUM_SHA256="b28708f92930b4e2c0ab39def12ebc6be466db5e91fad88bfc7ebf9aa9c9de16" SOURCE_DIR="python-lazy-object-proxy-$portVersion" @@ -34,33 +34,40 @@ for i in "${!PYTHON_PACKAGES[@]}"; do eval "PROVIDES_$pythonPackage=\" ${portName}_$pythonPackage = $portVersion \"" + if [ "$targetArchitecture" = x86_gcc2 ]; then + eval "PROVIDES_$pythonPackage+=\" + lazy_object_proxy_$pythonPackage = $portVersion + \"" + fi eval "REQUIRES_$pythonPackage=\" haiku cmd:python$pythonVersion\ \"" - BUILD_REQUIRES="$BUILD_REQUIRES - setuptools_scm_$pythonPackage" - BUILD_PREREQUIRES="$BUILD_PREREQUIRES + BUILD_REQUIRES+=" + build_$pythonPackage + installer_$pythonPackage + setuptools_scm_$pythonPackage + wheel_$pythonPackage + " + BUILD_PREREQUIRES+=" cmd:gcc$secondaryArchSuffix - cmd:python$pythonVersion" + cmd:python$pythonVersion + " done INSTALL() { - export SETUPTOOLS_SCM_PRETEND_VERSION=$portVersion for i in "${!PYTHON_PACKAGES[@]}"; do - pythonPackage=${PYTHON_PACKAGES[i]} pythonVersion=${PYTHON_VERSIONS[$i]} python=python$pythonVersion - installLocation=$prefix/lib/$python/vendor-packages/ - export PYTHONPATH=$installLocation:$PYTHONPATH - mkdir -p "$installLocation" - rm -rf build - $python setup.py build install \ - --root=/ --prefix="$prefix" - packageEntries $pythonPackage \ + rm -rf dist + + $python -m build --wheel --skip-dependency-check --no-isolation + $python -m installer --p $prefix dist/*.whl + + packageEntries ${PYTHON_PACKAGES[i]} \ "$prefix"/lib/python* done }