haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-19 10:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

PycURL: don't use $pythonVersion in REQUIRES_python* and BUILD_*.

Browse Source 
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
This commit is contained in:
fbrosson
2018-10-21 18:13:31 +00:00
parent 25ec06df17
commit ac9b1cfde2
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dev-python/pycurl/pycurl-7.43.0.2.recipe
View File

@@ -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
\""