From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 5 Jan 2021 06:03:39 +0000 (+0900)
Subject: meson: move several definitions related libsystemd to src/libsystemd/meson.build
X-Git-Tag: v248-rc1~304^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F18038%2Fhead;p=thirdparty%2Fsystemd.git

meson: move several definitions related libsystemd to src/libsystemd/meson.build
---

diff --git a/meson.build b/meson.build
index 40604b9f017..c12b399b5f2 100644
--- a/meson.build
+++ b/meson.build
@@ -1642,7 +1642,6 @@ subdir('src/shared')
 subdir('src/udev')
 subdir('src/libudev')
 
-libsystemd_sym_path = '@0@/@1@'.format(project_source_root, libsystemd_sym)
 libsystemd = shared_library(
         'systemd',
         disable_mempool_c,
@@ -1662,9 +1661,6 @@ libsystemd = shared_library(
         install : true,
         install_dir : rootlibdir)
 
-static_libsystemd = get_option('static-libsystemd')
-static_libsystemd_pic = static_libsystemd == 'true' or static_libsystemd == 'pic'
-
 install_libsystemd_static = static_library(
         'systemd',
         libsystemd_sources,
diff --git a/src/libsystemd/meson.build b/src/libsystemd/meson.build
index 3843c2aae07..b8a9bbe2226 100644
--- a/src/libsystemd/meson.build
+++ b/src/libsystemd/meson.build
@@ -170,7 +170,11 @@ libsystemd_static = static_library(
                         librt],
         c_args : libsystemd_c_args)
 
-libsystemd_sym = 'src/libsystemd/libsystemd.sym'
+libsystemd_sym = files('libsystemd.sym')
+libsystemd_sym_path = join_paths(meson.current_source_dir(), 'libsystemd.sym')
+
+static_libsystemd = get_option('static-libsystemd')
+static_libsystemd_pic = static_libsystemd == 'true' or static_libsystemd == 'pic'
 
 configure_file(
         input : 'libsystemd.pc.in',