mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-18 01:30:07 +02:00
PycURL: split & rewrite the eval command, use a simpler sed regexp.
devel:libpython was in BUILD_PREREQUIRES until the previous commit and was moved to BUILD_REQUIRES. Move it back to BUILD_PREREQUIRES. Every commit in this recipe has been tested locally on each arch, but something went wrong with pycurl_x86 in the build servers.
This commit is contained in:
@@ -64,32 +64,30 @@ fi
|
||||
for i in "${!PYTHON_PACKAGES[@]}"; do
|
||||
pythonPackage=${PYTHON_PACKAGES[i]}
|
||||
pythonLibSuffix=${PYTHON_LIBSUFFIXES[$i]}
|
||||
pythonVersion="`$pythonPackage --version 2>&1 | sed \
|
||||
-e "s/Python \([[:digit:]]*\.[[:digit:]]*\)\..*/\1/"`"
|
||||
pythonVersion="`$pythonPackage --version 2>&1 | sed -n \
|
||||
-e "s/Python \([0-9]*\.[0-9]*\)\..*/\1/p"`"
|
||||
PYTHON_VERSIONS+=($pythonVersion)
|
||||
|
||||
eval "\
|
||||
PROVIDES_${pythonPackage}=\"\n\
|
||||
${portName}_$pythonPackage = $portVersion\n\
|
||||
\"; \
|
||||
REQUIRES_$pythonPackage=\"\n\
|
||||
haiku$secondaryArchSuffix\n\
|
||||
cmd:python$pythonVersion\n\
|
||||
lib:libcrypto$secondaryArchSuffix\n\
|
||||
lib:libcurl$secondaryArchSuffix\n\
|
||||
lib:libnghttp2$secondaryArchSuffix\n\
|
||||
lib:libpython$pythonVersion$pythonLibSuffix$secondaryArchSuffix\n\
|
||||
lib:libssl$secondaryArchSuffix\n\
|
||||
lib:libz$secondaryArchSuffix\n\
|
||||
\"\
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="$BUILD_REQUIRES
|
||||
setuptools_$pythonPackage
|
||||
devel:libpython$pythonVersion$pythonLibSuffix$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="$BUILD_PREREQUIRES
|
||||
eval "PROVIDES_${pythonPackage}=\"
|
||||
${portName}_$pythonPackage = $portVersion
|
||||
\""
|
||||
eval "REQUIRES_$pythonPackage=\"
|
||||
haiku$secondaryArchSuffix
|
||||
cmd:python$pythonVersion
|
||||
lib:libcrypto$secondaryArchSuffix
|
||||
lib:libcurl$secondaryArchSuffix
|
||||
lib:libnghttp2$secondaryArchSuffix
|
||||
lib:libpython$pythonVersion$pythonLibSuffix$secondaryArchSuffix
|
||||
lib:libssl$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
\""
|
||||
|
||||
BUILD_REQUIRES+="
|
||||
setuptools_$pythonPackage
|
||||
"
|
||||
BUILD_PREREQUIRES+="
|
||||
cmd:python$pythonVersion
|
||||
devel:libpython$pythonVersion$pythonLibSuffix$secondaryArchSuffix
|
||||
"
|
||||
done
|
||||
|
||||
|
||||
Reference in New Issue
Block a user