From: Thomas Weißschuh Date: Sun, 14 May 2023 16:35:30 +0000 (+0200) Subject: build: align build-time checks between meson and autotools X-Git-Tag: v2.39~18 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0e186591a05fefe1959049799c713aa3a4bd30ac;p=thirdparty%2Futil-linux.git build: align build-time checks between meson and autotools Signed-off-by: Thomas Weißschuh --- diff --git a/meson.build b/meson.build index 931284152c..c56f83b1fa 100644 --- a/meson.build +++ b/meson.build @@ -167,10 +167,14 @@ headers = ''' linux/compiler.h linux/falloc.h linux/fd.h + linux/fs.h linux/fiemap.h linux/gsmmux.h + linux/if_alg.h + linux/kcmp.h linux/net_namespace.h linux/nsfs.h + linux/pr.h linux/stat.h linux/securebits.h linux/tiocl.h @@ -200,6 +204,7 @@ headers = ''' sys/socket.h sys/sockio.h sys/stat.h + sys/statfs.h sys/swap.h sys/syscall.h sys/sysmacros.h @@ -209,6 +214,7 @@ headers = ''' sys/types.h sys/ucred.h sys/un.h + sys/vfs.h sys/xattr.h '''.split() @@ -310,6 +316,7 @@ lib_systemd = dependency( 'libsystemd', required : get_option('systemd')) conf.set('HAVE_LIBSYSTEMD', lib_systemd.found() ? 1 : false) +conf.set('USE_SYSTEMD', lib_systemd.found() ? 1 : false) lib_udev = dependency( 'libudev', @@ -427,6 +434,9 @@ conf.set10('HAVE_STRSIGNAL_DECL', have) have = cc.sizeof('union semun', prefix : '#include ') > 0 conf.set('HAVE_UNION_SEMUN', have ? 1 : false) +have = cc.has_type('loff_t', prefix : '#include ') +conf.set('HAVE_LOFF_T', have ? 1 : false) + have = cc.compiles(''' #define _GNU_SOURCE 1 #include @@ -485,7 +495,6 @@ funcs = ''' err errx explicit_bzero - fmemopen fnmatch fseeko fsconfig @@ -493,6 +502,7 @@ funcs = ''' fsopen fspick fsync + getttynam utimensat getdomainname getdtablesize @@ -617,6 +627,12 @@ conf.set('HAVE_STRUCT_TM_TM_ZONE', have ? 1 : false) have = cc.has_header_symbol('time.h', 'tzname', args: '-D_GNU_SOURCE') conf.set('HAVE_DECL_TZNAME', have ? 1 : false) +have = cc.has_header_symbol('linux/blkzoned.h', 'BLK_ZONE_REP_CAPACITY') +conf.set('HAVE_DECL_BLK_ZONE_REP_CAPACITY', have ? 1 : false) + +have = cc.has_header_symbol('linux/pr.h', 'PR_REP_CAPACITY') +conf.set('HAVE_DECL_PR_REP_CAPACITY', have ? 1 : false) + code = ''' #include #if !@0@