From bdaed0cde46c59e0f29b1642b98a225f146d8c99 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 17 Mar 2021 15:42:26 +0100 Subject: [PATCH] meson: update for new hardlink Signed-off-by: Karel Zak --- meson.build | 6 +++--- meson_options.txt | 2 +- misc-utils/meson.build | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index 4dc9201a94..516773f3c3 100644 --- a/meson.build +++ b/meson.build @@ -260,9 +260,9 @@ lib_readline_static = dependency( required : need_static_libs ? get_option('readline') : disabler()) lib_pcre = dependency( - 'libpcre2-8', - required : get_option('libpcre')) -conf.set('HAVE_PCRE', lib_pcre.found() ? 1 : false) + 'libpcre2-posix', + required : get_option('libpcre2-posix')) +conf.set('HAVE_PCRE2_POSIX', lib_pcre.found() ? 1 : false) lib_user = dependency( 'libuser', diff --git a/meson_options.txt b/meson_options.txt index 2fb46b5862..b1650f61d6 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -11,7 +11,7 @@ option('zlib', type : 'feature') option('readline', type : 'feature') option('libutil', type : 'feature') option('libutempter', type : 'feature') -option('libpcre', type : 'feature') +option('libpcre2-posix', type : 'feature') option('libuser', type : 'feature') option('selinux', type : 'feature', value : 'disabled') option('audit', type : 'feature', value : 'disabled') diff --git a/misc-utils/meson.build b/misc-utils/meson.build index 317528d6ec..0db84cf6ea 100644 --- a/misc-utils/meson.build +++ b/misc-utils/meson.build @@ -130,7 +130,8 @@ fincore_sources = files( hardlink_sources = files( 'hardlink.c', -) +) + \ + monotonic_c cal_sources = files( 'cal.c', -- 2.47.3