From 2dbb0fe320ca75e7e2be6eba8b5fe6fe07a1ece1 Mon Sep 17 00:00:00 2001 From: Sergey Bobrenok Date: Thu, 18 Aug 2022 21:51:58 +0300 Subject: [PATCH] Remove dependency from coreutils In a conan recipe we already know the relative path to the source directory. We can simply replace '@CONAN_SRC_REL_PATH@' with the actual path there. --- meson.build | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 177cd4fb66..869c2352f6 100644 --- a/meson.build +++ b/meson.build @@ -33,9 +33,7 @@ substs.set('PROJECT_VERSION', meson.project_version(), # the wrong result when systemd is being built as a meson subproject project_source_root = meson.current_source_dir() project_build_root = meson.current_build_dir() -relative_source_path = run_command('realpath', - '--relative-to=@0@'.format(project_build_root), - project_source_root).stdout().strip() +relative_source_path = @CONAN_SRC_REL_PATH@ conf.set_quoted('RELATIVE_SOURCE_PATH', relative_source_path) conf.set('BUILD_MODE', 'BUILD_MODE_' + get_option('mode').to_upper(), base-commit: bb47600aeb38c68c857fbf0ee5f66c3144dd81ce -- 2.40.1