1
0
Fork 0

Merging upstream version 2.6.

Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-16 12:24:54 +01:00
parent 52cbdbff70
commit 407776cd14
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
262 changed files with 7434 additions and 3024 deletions

View file

@ -4,7 +4,7 @@ project(
'nvme-cli', ['c'],
meson_version: '>= 0.50.0',
license: 'GPL-2.0-only',
version: '2.5',
version: '2.6',
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.5', required: true,
libnvme_dep = dependency('libnvme', version: '>=1.6', required: true,
fallback : ['libnvme', 'libnvme_dep'])
libnvme_mi_dep = dependency('libnvme-mi', required: true,
fallback : ['libnvme', 'libnvme_mi_dep'])
@ -157,6 +157,11 @@ conf.set10(
),
description: 'Is sys/random.h(getrandom) include-able?'
)
conf.set10(
'HAVE_ATTRIBUTE_UNUSED',
cc.get_id() == 'clang',
description: 'Is compiler warning about unused static line function?'
)
if cc.has_function_attribute('fallthrough')
conf.set('fallthrough', '__attribute__((__fallthrough__))')