Skip to content

Commit b06e98b

Browse files
haiku: fix openssl dependency
- haiku r1beta5 has openssl 3.0, install openssl 3.5.6 packages from current master - let pkg-config find openssl
1 parent 91462bb commit b06e98b

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

.github/workflows/ci.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -442,10 +442,12 @@ jobs:
442442
haiku)
443443
pkgman refresh
444444
pkgman install -y git pkgconfig lz4
445-
pkgman install -y openssl3
446445
pkgman install -y rust_bin
447-
pkgman install -y python3.10
448-
pkgman install -y lz4_devel openssl3_devel
446+
pkgman install -y python3.10 lz4_devel
447+
# haiku r1beta5 has OpenSSL 3.0.14, so we manually pull 3.5.6 from current master:
448+
curl -L -O https://eu.hpkg.haiku-os.org/haikuports/master/x86_64/current/packages/openssl3-3.5.6-1-x86_64.hpkg
449+
curl -L -O https://eu.hpkg.haiku-os.org/haikuports/master/x86_64/current/packages/openssl3_devel-3.5.6-1-x86_64.hpkg
450+
pkgman install -y openssl3-3.5.6-1-x86_64.hpkg openssl3_devel-3.5.6-1-x86_64.hpkg
449451
450452
# there is no pkgman package for tox, so we install it into a venv
451453
python3 -m ensurepip --upgrade
@@ -455,7 +457,6 @@ jobs:
455457
456458
export PKG_CONFIG_PATH="/system/develop/lib/pkgconfig:/system/lib/pkgconfig:${PKG_CONFIG_PATH:-}"
457459
export BORG_LIBLZ4_PREFIX=/system/develop
458-
export BORG_OPENSSL_PREFIX=/system/develop
459460
pip install -r requirements.d/development.lock.txt
460461
pip install -e .
461462

0 commit comments

Comments
 (0)