File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -447,10 +447,12 @@ jobs:
447447 haiku)
448448 pkgman refresh
449449 pkgman install -y git pkgconfig lz4
450- pkgman install -y openssl3
451450 pkgman install -y rust_bin
452- pkgman install -y python3.10
453- pkgman install -y lz4_devel openssl3_devel
451+ pkgman install -y python3.10 lz4_devel
452+ # haiku r1beta5 has OpenSSL 3.0.14, so we manually pull 3.5.6 from current master:
453+ curl -L -O https://eu.hpkg.haiku-os.org/haikuports/master/x86_64/current/packages/openssl3-3.5.6-1-x86_64.hpkg
454+ curl -L -O https://eu.hpkg.haiku-os.org/haikuports/master/x86_64/current/packages/openssl3_devel-3.5.6-1-x86_64.hpkg
455+ pkgman install -y openssl3-3.5.6-1-x86_64.hpkg openssl3_devel-3.5.6-1-x86_64.hpkg
454456
455457 # there is no pkgman package for tox, so we install it into a venv
456458 python3 -m ensurepip --upgrade
@@ -460,7 +462,6 @@ jobs:
460462
461463 export PKG_CONFIG_PATH="/system/develop/lib/pkgconfig:/system/lib/pkgconfig:${PKG_CONFIG_PATH:-}"
462464 export BORG_LIBLZ4_PREFIX=/system/develop
463- export BORG_OPENSSL_PREFIX=/system/develop
464465 pip install -r requirements.d/development.lock.txt
465466 pip install -e .
466467
You can’t perform that action at this time.
0 commit comments