diff --git a/dev-python/pycurl/pycurl-7.43.0.2.recipe b/dev-python/pycurl/pycurl-7.43.0.3.recipe similarity index 87% rename from dev-python/pycurl/pycurl-7.43.0.2.recipe rename to dev-python/pycurl/pycurl-7.43.0.3.recipe index 10d57d26c..07c50918a 100644 --- a/dev-python/pycurl/pycurl-7.43.0.2.recipe +++ b/dev-python/pycurl/pycurl-7.43.0.3.recipe @@ -10,9 +10,10 @@ COPYRIGHT="2001-2008 Kjetil Jacobsen 2013-2018 Oleg Pudeyev" LICENSE="GNU LGPL v2.1 MIT" -REVISION="4" -SOURCE_URI="https://dl.bintray.com/pycurl/pycurl/pycurl-$portVersion.tar.gz" -CHECKSUM_SHA256="0f0cdfc7a92d4f2a5c44226162434e34f7d6967d3af416a6f1448649c09a25a4" +REVISION="1" +SOURCE_URI="https://github.com/pycurl/pycurl/archive/REL_${portVersion//./_}.tar.gz" +CHECKSUM_SHA256="553047902a738cc2e6b1cd42783a9d0992e47086773be30027a71e1293493c39" +SOURCE_DIR="pycurl-REL_${portVersion//./_}" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -56,24 +57,12 @@ if [ -z "$secondaryArchSuffix" ]; then PYTHON_PACKAGES+=(python) PYTHON_VERSIONS+=(2.7) PYTHON_LIBSUFFIXES+=("") - BUILD_REQUIRES+=" - setuptools_python - " - BUILD_PREREQUIRES+=" - cmd:python2 - " fi # gcc2 does not support the flags passed by python3 if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then - PYTHON_PACKAGES+=(python3) - PYTHON_VERSIONS+=(3.6) + PYTHON_PACKAGES+=(python36 python3) + PYTHON_VERSIONS+=(3.6 3.7) PYTHON_LIBSUFFIXES+=(m) - BUILD_REQUIRES+=" - setuptools_python3 - " - BUILD_PREREQUIRES+=" - cmd:python3 - " fi for i in "${!PYTHON_PACKAGES[@]}"; do pythonPackage=${PYTHON_PACKAGES[i]} @@ -92,6 +81,10 @@ for i in "${!PYTHON_PACKAGES[@]}"; do lib:libssl$secondaryArchSuffix lib:libz$secondaryArchSuffix \"" +BUILD_REQUIRES="$BUILD_REQUIRES + setuptools_$pythonPackage" +BUILD_PREREQUIRES="$BUILD_PREREQUIRES + cmd:python$pythonVersion" done INSTALL() @@ -104,6 +97,7 @@ INSTALL() installLocation="$prefix"/lib/$python/vendor-packages/ export PYTHONPATH="$installLocation" rm -rf build + make mkdir -p "$installLocation" $python setup.py build install --root=/ --prefix="$prefix"