Skip to content

Commit 25fe85d

Browse files
authored
Merge pull request #136 from scribam/ci-bsd
ci: update bsd operating systems
2 parents 62f91bb + 6a5d1c3 commit 25fe85d

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

.github/workflows/bsd.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@ jobs:
1111
architecture: [ arm64, x86-64 ]
1212
include:
1313
- operating_system: freebsd
14-
version: '14.0'
15-
pkginstall: sudo pkg install -y cmake git ninja pkgconf
14+
version: '14.2'
15+
pkginstall: sudo pkg update && sudo pkg install -y cmake git ninja pkgconf
1616
- operating_system: netbsd
17-
version: '10.0'
18-
pkginstall: sudo pkgin update && sudo pkgin -y install cmake gcc12 git ninja-build pkgconf && export PATH=/usr/pkg/gcc12/bin:$PATH
17+
version: '10.1'
18+
pkginstall: sudo pkgin update && sudo pkgin -y install clang cmake git ninja-build pkgconf
1919
- operating_system: openbsd
20-
version: '7.5'
21-
pkginstall: sudo pkg_add cmake git ninja pkgconf
20+
version: '7.7'
21+
pkginstall: sudo pkg_add -u && sudo pkg_add cmake git ninja pkgconf
2222

2323
steps:
2424
- uses: actions/checkout@v4
2525

26-
- uses: cross-platform-actions/action@v0.24.0
26+
- uses: cross-platform-actions/action@v0.28.0
2727
with:
2828
operating_system: ${{ matrix.operating_system }}
2929
architecture: ${{ matrix.architecture }}

deps/lzma-24.05/src/CpuArch.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -799,7 +799,11 @@ BoolInt CPU_IsSupported_AES (void) { return APPLE_CRYPTO_SUPPORT_VAL; }
799799

800800
#ifdef USE_HWCAP
801801

802-
#if defined(__FreeBSD__)
802+
#if defined(__FreeBSD__) || defined(__OpenBSD__)
803+
#include <sys/param.h>
804+
#endif
805+
806+
#if (defined(__FreeBSD__) && __FreeBSD_version >= 1200000) || (defined(__OpenBSD__) && OpenBSD >= 202409)
803807
static unsigned long MY_getauxval(int aux)
804808
{
805809
unsigned long val;

0 commit comments

Comments
 (0)