From ac9b1cfde20f5b324fc6bffb1618151dd734c084 Mon Sep 17 00:00:00 2001 From: fbrosson Date: Sun, 21 Oct 2018 18:13:31 +0000 Subject: [PATCH] PycURL: don't use $pythonVersion in REQUIRES_python* and BUILD_*. This variable is being computed with an eval call which seems to be upsetting the build bots but none of my systems. So use: * cmd:python2 instead of cmd:python2.7 and lib:libpython2.7 * cmd:python3 instead of cmd:python3.6 and lib:libpython3.6m --- dev-python/pycurl/pycurl-7.43.0.2.recipe | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dev-python/pycurl/pycurl-7.43.0.2.recipe b/dev-python/pycurl/pycurl-7.43.0.2.recipe index dc4e4d7c6..a4c2c2caa 100644 --- a/dev-python/pycurl/pycurl-7.43.0.2.recipe +++ b/dev-python/pycurl/pycurl-7.43.0.2.recipe @@ -49,12 +49,12 @@ BUILD_PREREQUIRES=" " PYTHON_PACKAGES=() -PYTHON_LIBSUFFIXES=() +PYTHON_MAJOR_VERSIONS=() PYTHON_VERSIONS=() # We don't have python2 for secondaryArch, if [ -z "$secondaryArchSuffix" ]; then PYTHON_PACKAGES+=(python) - PYTHON_LIBSUFFIXES+=("") + PYTHON_MAJOR_VERSIONS+=(2) BUILD_REQUIRES+=" setuptools_python " @@ -65,7 +65,7 @@ fi # gcc2 does not support the flags passed by python3 if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then PYTHON_PACKAGES+=(python3) - PYTHON_LIBSUFFIXES+=(m) + PYTHON_MAJOR_VERSIONS+=(3) BUILD_REQUIRES+=" setuptools_python3 " @@ -75,7 +75,7 @@ if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then fi for i in "${!PYTHON_PACKAGES[@]}"; do pythonPackage=${PYTHON_PACKAGES[i]} - pythonLibSuffix=${PYTHON_LIBSUFFIXES[$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) @@ -85,11 +85,10 @@ for i in "${!PYTHON_PACKAGES[@]}"; do \"" eval "REQUIRES_$pythonPackage=\" haiku$secondaryArchSuffix - cmd:python$pythonVersion + cmd:python$pythonMajorVersion lib:libcrypto$secondaryArchSuffix lib:libcurl$secondaryArchSuffix lib:libnghttp2$secondaryArchSuffix - lib:libpython$pythonVersion$pythonLibSuffix$secondaryArchSuffix lib:libssl$secondaryArchSuffix lib:libz$secondaryArchSuffix \""