diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-02-19 10:45:34 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-02-19 10:45:34 +0000 |
commit | 749efe961f0e1a71461a9c79e6e4584d35af6e7f (patch) | |
tree | c953c007cbe4f60a147ab62f97937d58abb2e9ca /meson.build | |
parent | Adding upstream version 2.7.1. (diff) | |
download | nvme-cli-upstream/2.8.tar.xz nvme-cli-upstream/2.8.zip |
Adding upstream version 2.8.upstream/2.8
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r-- | meson.build | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/meson.build b/meson.build index 0961c26..1b31603 100644 --- a/meson.build +++ b/meson.build @@ -4,7 +4,7 @@ project( 'nvme-cli', ['c'], meson_version: '>= 0.50.0', license: 'GPL-2.0-only', - version: '2.7.1', + version: '2.8', default_options: [ 'c_std=gnu99', 'buildtype=debug', @@ -48,7 +48,7 @@ conf.set('SYSCONFDIR', '"@0@"'.format(sysconfdir)) conf.set('RUNDIR', '"@0@"'.format(rundir)) # Check for libnvme availability -libnvme_dep = dependency('libnvme', version: '>=1.7', required: true, +libnvme_dep = dependency('libnvme', version: '>=1.8', required: true, fallback : ['libnvme', 'libnvme_dep']) libnvme_mi_dep = dependency('libnvme-mi', required: true, fallback : ['libnvme', 'libnvme_mi_dep']) @@ -153,6 +153,29 @@ conf.set10( cc.get_id() == 'clang', description: 'Is compiler warning about unused static line function?' ) +conf.set10( + 'HAVE_SED_OPAL', + cc.compiles( + '''#include <linux/sed-opal.h>''', + name: 'linux/sed-opal.h' + + ), + description: 'Is linux/sed-opa.h include-able?' +) +conf.set10( + 'HAVE_KEY_TYPE', + cc.compiles( + ''' + #include <linux/sed-opal.h> + int main(void) { + struct opal_key key; + key.key_type = OPAL_INCLUDED; + } + ''', + name: 'key_type' + ), + description: 'Does struct opal_key have a key_type field?' +) if cc.has_function_attribute('fallthrough') conf.set('fallthrough', '__attribute__((__fallthrough__))') |