Browse Source

Enhance the dealing with glibc-2.28

It appears that the necessary bits were already there, but commented
out. When meson checked for 'struct statx', the inclusion of both
sys/stat.h and linux/stat.h where commented out. Uncommenting them
should be enough.
tags/debian-devuan_common
Sven Eden 3 years ago
parent
commit
2e0ffb64e2
2 changed files with 3 additions and 10 deletions
  1. +2
    -9
      meson.build
  2. +1
    -1
      src/basic/missing.h

+ 2
- 9
meson.build View File

@@ -491,8 +491,8 @@ decl_headers = '''
#include <uchar.h>
#include <linux/ethtool.h>
#include <linux/fib_rules.h>
//#include <linux/stat.h>
//#include <sys/stat.h>
#include <linux/stat.h>
#include <sys/stat.h>
'''
# FIXME: key_serial_t is only defined in keyutils.h, this is bound to fail

@@ -509,13 +509,6 @@ foreach decl : ['char16_t',
conf.set10('HAVE_' + decl.underscorify().to_upper(), have)
endforeach

conf.set10('HAVE_STRUCT_STATX_IN_SYS_STAT_H', cc.sizeof('struct statx', prefix : '''
#include <sys/stat.h>
''', args : '-D_GNU_SOURCE') > 0)
conf.set10('HAVE_STRUCT_STATX_IN_LINUX_STAT_H', cc.sizeof('struct statx', prefix : '''
#include <linux/stat.h>
''', args : '-D_GNU_SOURCE') > 0)

foreach decl : [['IFLA_INET6_ADDR_GEN_MODE', 'linux/if_link.h'],
['IN6_ADDR_GEN_MODE_STABLE_PRIVACY', 'linux/if_link.h'],
['IFLA_VRF_TABLE', 'linux/if_link.h'],


+ 1
- 1
src/basic/missing.h View File

@@ -1371,7 +1371,7 @@ struct fib_rule_uid_range {
#define PF_KTHREAD 0x00200000
#endif

#if !HAVE_STRUCT_STATX_IN_SYS_STAT_H && !HAVE_STRUCT_STATX_IN_LINUX_STAT_H
#if ! HAVE_STRUCT_STATX
struct statx_timestamp {
int64_t tv_sec;
uint32_t tv_nsec;


Loading…
Cancel
Save