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

brotli: minor clean up, drop Python 3.9. (#11724)

Browse Source 
As current TEST() produces no output, tried modifing it in several ways:
calling ctest, make -C tests test, etc, etc. Mostly got zero test runs, except
once that I got:

> 0% tests passed, 14 tests failed out of 14

but couldn't reproduce :-/

Help on figuring out what's the proper way to execute tests much appreciated.

Smoke tested on beta5 64 bits, both on `python3.10` and with `links` (that requires brotli).
This commit is contained in:
OscarL
2025-02-05 05:34:08 -03:00
committed by GitHub
parent 206a9e2cfe
commit 43466838a6
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app-arch/brotli/brotli-1.1.0.recipe
View File

@@ -7,7 +7,7 @@ methods. It is similar in speed with deflate but offers more dense compression."
HOMEPAGE="https://github.com/google/brotli" HOMEPAGE="https://github.com/google/brotli"
COPYRIGHT="2009, 2010, 2013-2023 Brotli Authors" COPYRIGHT="2009, 2010, 2013-2023 Brotli Authors"
LICENSE="MIT" LICENSE="MIT"
REVISION="1" REVISION="2"
SOURCE_URI="https://github.com/google/brotli/archive/v$portVersion.tar.gz" SOURCE_URI="https://github.com/google/brotli/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="e720a6ca29428b803f4ad165371771f5398faba397edf6778837a18599ea13ff" CHECKSUM_SHA256="e720a6ca29428b803f4ad165371771f5398faba397edf6778837a18599ea13ff"
SOURCE_FILENAME="brotli-$portVersion.tar.gz" SOURCE_FILENAME="brotli-$portVersion.tar.gz"
@@ -54,18 +54,18 @@ BUILD_PREREQUIRES="
cmd:make cmd:make
" "
PYTHON_PACKAGES+=(python310)
PYTHON_VERSIONS+=(3.10) PYTHON_VERSIONS+=(3.10)
for i in "${!PYTHON_PACKAGES[@]}"; do
pythonPackage=${PYTHON_PACKAGES[i]} for i in "${!PYTHON_VERSIONS[@]}"; do
pythonVersion=${PYTHON_VERSIONS[$i]} pythonVersion=${PYTHON_VERSIONS[$i]}
pythonPackage=python${pythonVersion//.}
eval "PROVIDES_${pythonPackage}=\" eval "PROVIDES_${pythonPackage}=\"
${portName}_$pythonPackage = $portVersion ${portName}_$pythonPackage = $portVersion
\"" \""
eval "REQUIRES_$pythonPackage=\" eval "REQUIRES_$pythonPackage=\"
haiku$secondaryArchSuffix haiku$secondaryArchSuffix
lib:libpython$pythonVersion$secondaryArchSuffix cmd:python$pythonVersion
\"" \""
BUILD_REQUIRES+=" BUILD_REQUIRES+="
setuptools_$pythonPackage setuptools_$pythonPackage
@@ -75,7 +75,6 @@ for i in "${!PYTHON_PACKAGES[@]}"; do
" "
done done
BUILD() BUILD()
{ {
cmake \ cmake \
@@ -89,21 +88,19 @@ BUILD()
make -C build $jobArgs make -C build $jobArgs
} }
INSTALL() INSTALL()
{ {
make -C build install make -C build install
for i in "${!PYTHON_PACKAGES[@]}"; do for i in "${!PYTHON_VERSIONS[@]}"; do
pythonPackage=${PYTHON_PACKAGES[i]}
pythonVersion=${PYTHON_VERSIONS[$i]} pythonVersion=${PYTHON_VERSIONS[$i]}
pythonPackage=python${pythonVersion//.}
python=python$pythonVersion python=python$pythonVersion
installLocation=$prefix/lib/$python/vendor-packages/ installLocation=$prefix/lib/$python/vendor-packages/
export PYTHONPATH=$installLocation:$PYTHONPATH export PYTHONPATH=$installLocation:$PYTHONPATH
mkdir -p $installLocation mkdir -p $installLocation
rm -rf build
$python setup.py build install \ $python setup.py build install \
--root=/ --prefix=$prefix --root=/ --prefix=$prefix
@@ -124,14 +121,14 @@ INSTALL()
"$developDir" "$developDir"
} }
TEST() TEST()
{ {
for i in "${!PYTHON_VERSIONS[@]}"; do
for i in "${!PYTHON_PACKAGES[@]}"; do
pythonVersion=${PYTHON_VERSIONS[$i]} pythonVersion=${PYTHON_VERSIONS[$i]}
python=python$pythonVersion python=python$pythonVersion
$python setup.py test $python setup.py test
done done
ctest --test-dir build --output-on-failure
} }