Skip to content

Commit

Permalink
Temporary workaround to allow building with meson version currently p…
Browse files Browse the repository at this point in the history
…rovided on Ubuntu 22.04 LTS
  • Loading branch information
dgsga committed Mar 14, 2024
1 parent d2f3ffc commit cac7368
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/meson.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
name: Ubuntu
runs-on: ubuntu-22.04
container:
image: ubuntu:mantic
image: ubuntu:22.04
steps:
- uses: actions/checkout@v4
- name: Install dependencies
Expand Down
11 changes: 8 additions & 3 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ project(
version: '3.1.99dev',
license: 'GPLv2',
default_options: ['warning_level=3', 'c_std=c11'],
meson_version: '>=0.62.0',
meson_version: '>=0.61.2',
# Reserved for future use:
# meson_version: '>=0.62.0',
)

cc = meson.get_compiler('c')
Expand Down Expand Up @@ -844,15 +846,18 @@ cast5_api = run_command(
check: false,
).stdout().strip().contains('cast5')

libgcrypt_version = libgcrypt_config.version().version_compare('>=1.2.3')
# Reserved for future use:
# libgcrypt_version = libgcrypt_config.version().version_compare('>=1.2.3')

if not libgcrypt.found()
have_libgcrypt = false
error(
'Libgcrypt library required for DHX2 UAM! Please install version 1.2.3 or later',
)
else
have_libgcrypt = libgcrypt_version and cast5_api
# Reserved for future use:
# have_libgcrypt = libgcrypt_version and cast5_api
have_libgcrypt = libgcrypt.found() and cast5_api
if not cast5_api
have_libgcrypt = false
error(
Expand Down

0 comments on commit cac7368

Please sign in to comment.