Merge pull request #9472 from ThomasWaldmann/ci-openbsd78

adapt for OpenBSD 7.8 (CI and setup.py, master)
This commit is contained in:
TW 2026-03-13 11:36:45 +01:00 committed by GitHub
commit a32d9724f0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions

View file

@ -400,7 +400,7 @@ jobs:
do_binaries: false
- os: openbsd
version: '7.7'
version: '7.8'
display_name: OpenBSD
do_binaries: false
@ -529,10 +529,10 @@ jobs:
openbsd)
sudo -E pkg_add lz4 git
sudo -E pkg_add rust
sudo -E pkg_add openssl%3.4
sudo -E pkg_add openssl%3.5
sudo -E pkg_add py3-pip py3-virtualenv py3-tox
export BORG_OPENSSL_NAME=eopenssl34
export BORG_OPENSSL_NAME=eopenssl35
tox -e py312-none
;;

View file

@ -145,7 +145,7 @@ if not on_rtd:
# it statically to avoid conflicting with shared libcrypto from the base
# OS pulled in via dependencies.
openssl_prefix = os.environ.get("BORG_OPENSSL_PREFIX", "/usr/local")
openssl_name = os.environ.get("BORG_OPENSSL_NAME", "eopenssl33")
openssl_name = os.environ.get("BORG_OPENSSL_NAME", "eopenssl35")
crypto_ext_lib = dict(
include_dirs=[os.path.join(openssl_prefix, "include", openssl_name)],
extra_objects=[os.path.join(openssl_prefix, "lib", openssl_name, "libcrypto.a")],