diff --git a/dev-python/pycurl/pycurl-7.43.0.2.recipe b/dev-python/pycurl/pycurl-7.43.0.2.recipe index a4c2c2caa..ac3988b8e 100644 --- a/dev-python/pycurl/pycurl-7.43.0.2.recipe +++ b/dev-python/pycurl/pycurl-7.43.0.2.recipe @@ -5,12 +5,12 @@ fetch objects identified by a URL from a Python program. Beyond simple fetches \ however PycURL exposes most of the functionality of libcurl." HOMEPAGE="http://pycurl.io/ https://github.com/pycurl/pycurl" -COPYRIGHT="2001-2008 by Kjetil Jacobsen - 2001-2008 by Markus F.X.J. Oberhumer - 2013-2018 by Oleg Pudeyev" +COPYRIGHT="2001-2008 Kjetil Jacobsen + 2001-2008 Markus F.X.J. Oberhumer + 2013-2018 Oleg Pudeyev" LICENSE="GNU LGPL v2.1 MIT" -REVISION="2" +REVISION="3" SOURCE_URI="https://dl.bintray.com/pycurl/pycurl/pycurl-$portVersion.tar.gz" CHECKSUM_SHA256="0f0cdfc7a92d4f2a5c44226162434e34f7d6967d3af416a6f1448649c09a25a4" @@ -49,12 +49,13 @@ BUILD_PREREQUIRES=" " PYTHON_PACKAGES=() -PYTHON_MAJOR_VERSIONS=() PYTHON_VERSIONS=() +PYTHON_LIBSUFFIXES=() # We don't have python2 for secondaryArch, if [ -z "$secondaryArchSuffix" ]; then PYTHON_PACKAGES+=(python) - PYTHON_MAJOR_VERSIONS+=(2) + PYTHON_VERSIONS+=(2.7) + PYTHON_LIBSUFFIXES+=("") BUILD_REQUIRES+=" setuptools_python " @@ -65,7 +66,8 @@ fi # gcc2 does not support the flags passed by python3 if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then PYTHON_PACKAGES+=(python3) - PYTHON_MAJOR_VERSIONS+=(3) + PYTHON_VERSIONS+=(3.6) + PYTHON_LIBSUFFIXES+=(m) BUILD_REQUIRES+=" setuptools_python3 " @@ -75,20 +77,18 @@ if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then fi for i in "${!PYTHON_PACKAGES[@]}"; do pythonPackage=${PYTHON_PACKAGES[i]} - pythonMajorVersion=${PYTHON_MAJOR_VERSIONS[$i]} - pythonVersion=`eval "$pythonPackage --version 2>&1" | sed -n \ - -e "1s/Python \([0-9]*\.[0-9]*\)\..*/\1/p"` - PYTHON_VERSIONS+=($pythonVersion) + pythonVersion=${PYTHON_VERSIONS[$i]} + pythonLibSuffix=${PYTHON_VERSIONS[$i]} eval "PROVIDES_${pythonPackage}=\" ${portName}_$pythonPackage = $portVersion \"" eval "REQUIRES_$pythonPackage=\" haiku$secondaryArchSuffix - cmd:python$pythonMajorVersion lib:libcrypto$secondaryArchSuffix lib:libcurl$secondaryArchSuffix lib:libnghttp2$secondaryArchSuffix + lib:libpython$pythonVersion$pythonLibSuffix$secondaryArchSuffix lib:libssl$secondaryArchSuffix lib:libz$secondaryArchSuffix \""