diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-06-29 16:25:52 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-29 16:25:52 +0200 |
commit | e0e334d0e42fa6d27a3d6ab5e593cb40e19d6f5a (patch) | |
tree | fdd2c891cc535a30c4accbf4f1ba0edc155b5a93 | |
parent | 60ccab093e175f77f72f57eae59c8d0d1628d012 (diff) | |
parent | e110599b63d95f81c1f574613f0a0ba3d3ce6403 (diff) | |
download | systemd-e0e334d0e42fa6d27a3d6ab5e593cb40e19d6f5a.tar.gz systemd-e0e334d0e42fa6d27a3d6ab5e593cb40e19d6f5a.tar.bz2 systemd-e0e334d0e42fa6d27a3d6ab5e593cb40e19d6f5a.zip |
Merge pull request #12907 from yuwata/meson-default-libidn2
meson: use libidn2 and drop udev debug option
-rw-r--r-- | NEWS | 3 | ||||
-rw-r--r-- | meson.build | 21 | ||||
-rw-r--r-- | meson_options.txt | 2 |
3 files changed, 12 insertions, 14 deletions
@@ -70,6 +70,9 @@ CHANGES WITH 243 in spe: build/man/man systemctl build/man/html systemd.index + * libidn2 is used by default if both libidn2 and libidn are installed. + Please use -Dlibidn=true when libidn is favorable. + * The D-Bus "wire format" for CPUAffinity attribute is changed on big-endian machines. Before, bytes were written and read in native machine order as exposed by the native libc __cpu_mask interface. diff --git a/meson.build b/meson.build index e9c44bbb94..c60c4ab873 100644 --- a/meson.build +++ b/meson.build @@ -793,7 +793,6 @@ substs.set('DEBUGTTY', get_option('debug-tty')) enable_debug_hashmap = false enable_debug_mmap_cache = false enable_debug_siphash = false -enable_debug_udev = false foreach name : get_option('debug-extra') if name == 'hashmap' enable_debug_hashmap = true @@ -801,8 +800,6 @@ foreach name : get_option('debug-extra') enable_debug_mmap_cache = true elif name == 'siphash' enable_debug_siphash = true - elif name == 'udev' - enable_debug_udev = true else message('unknown debug option "@0@", ignoring'.format(name)) endif @@ -810,7 +807,6 @@ endforeach conf.set10('ENABLE_DEBUG_HASHMAP', enable_debug_hashmap) conf.set10('ENABLE_DEBUG_MMAP_CACHE', enable_debug_mmap_cache) conf.set10('ENABLE_DEBUG_SIPHASH', enable_debug_siphash) -conf.set10('ENABLE_DEBUG_UDEV', enable_debug_udev) conf.set10('VALGRIND', get_option('valgrind')) conf.set10('LOG_TRACE', get_option('log-trace')) @@ -989,24 +985,24 @@ if want_libidn == 'true' and want_libidn2 == 'true' error('libidn and libidn2 cannot be requested simultaneously') endif -if want_libidn != 'false' and want_libidn2 != 'true' and not skip_deps - libidn = dependency('libidn', - required : want_libidn == 'true') +if want_libidn2 != 'false' and want_libidn != 'true' and not skip_deps + libidn = dependency('libidn2', + required : want_libidn2 == 'true') have = libidn.found() else have = false libidn = [] endif -conf.set10('HAVE_LIBIDN', have) -if not have and want_libidn2 != 'false' and not skip_deps +conf.set10('HAVE_LIBIDN2', have) +if not have and want_libidn != 'false' and not skip_deps # libidn is used for both libidn and libidn2 objects - libidn = dependency('libidn2', - required : want_libidn2 == 'true') + libidn = dependency('libidn', + required : want_libidn == 'true') have = libidn.found() else have = false endif -conf.set10('HAVE_LIBIDN2', have) +conf.set10('HAVE_LIBIDN', have) want_libiptc = get_option('libiptc') if want_libiptc != 'false' and not skip_deps @@ -3199,7 +3195,6 @@ foreach tuple : [ ['debug hashmap'], ['debug mmap cache'], ['debug siphash'], - ['debug udev'], ['valgrind', conf.get('VALGRIND') == 1], ['trace logging', conf.get('LOG_TRACE') == 1], ['link-udev-shared', get_option('link-udev-shared')], diff --git a/meson_options.txt b/meson_options.txt index b96e49d825..e56d33760b 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -46,7 +46,7 @@ option('debug-shell', type : 'string', value : '/bin/sh', description : 'path to debug shell binary') option('debug-tty', type : 'string', value : '/dev/tty9', description : 'specify the tty device for debug shell') -option('debug-extra', type : 'array', choices : ['hashmap', 'mmap-cache', 'siphash', 'udev'], value : [], +option('debug-extra', type : 'array', choices : ['hashmap', 'mmap-cache', 'siphash'], value : [], description : 'enable extra debugging') option('memory-accounting-default', type : 'boolean', description : 'enable MemoryAccounting= by default') |