diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-04-09 13:11:49 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-04-23 21:47:26 -0400 |
| commit | 6b30f2801b426dc8a48412f8fd3789fd84521407 (patch) | |
| tree | 47e0e27e51dff46490a642aa83772a17e571a4c8 /src | |
| parent | 572baca1d4bad218805b71be7f92b2c0385ec1e6 (diff) | |
meson: include the library symbol version list in link_depends
This is pretty ugly, because I don't know how to use a single
definition for two purposes:
- --version-script needs a path relative to the build root
- link_depends needs a path relative to source root
Also, link_depends does not accept files() output
[https://github.com/mesonbuild/meson/issues/1172], and I don't see a way to go
from files() output to a string path that can be used to craft the -Wl arg.
Ideally, a single files() result could be used in both places.
I'm leaving this as a separate commit for now.
Diffstat (limited to 'src')
| -rw-r--r-- | src/libsystemd/meson.build | 2 | ||||
| -rw-r--r-- | src/libudev/meson.build | 6 | ||||
| -rw-r--r-- | src/login/meson.build | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/libsystemd/meson.build b/src/libsystemd/meson.build index 9c6e494b93..5df62ac763 100644 --- a/src/libsystemd/meson.build +++ b/src/libsystemd/meson.build @@ -88,7 +88,7 @@ libsystemd_internal = static_library( dependencies : [threads, librt]) -libsystemd_sym = meson.current_source_dir() + '/libsystemd.sym' +libsystemd_sym = 'src/libsystemd/libsystemd.sym' libsystemd_pc = configure_file( input : 'libsystemd.pc.in', diff --git a/src/libudev/meson.build b/src/libudev/meson.build index 5730522ce0..e303ee8518 100644 --- a/src/libudev/meson.build +++ b/src/libudev/meson.build @@ -16,17 +16,19 @@ libudev_sources = ''' ############################################################ -libudev_sym = meson.current_source_dir() + '/libudev.sym' +libudev_sym = 'libudev.sym' +version_script_arg = '@0@/@1@'.format(meson.current_source_dir(), libudev_sym) libudev = shared_library( 'udev', libudev_sources, version : '1.6.6', include_directories : includes, link_args : ['-shared', - '-Wl,--version-script=' + libudev_sym], + '-Wl,--version-script=' + version_script_arg], link_with : [libbasic, libsystemd], + link_depends : libudev_sym, install : true, install_dir : rootlibdir) diff --git a/src/login/meson.build b/src/login/meson.build index 5c957063eb..75b8498862 100644 --- a/src/login/meson.build +++ b/src/login/meson.build @@ -65,7 +65,7 @@ if conf.get('ENABLE_LOGIND', 0) == 1 install_data(logind_conf, install_dir : pkgsysconfdir) - pam_systemd_sym = meson.current_source_dir() + '/pam_systemd.sym' + pam_systemd_sym = 'src/login/pam_systemd.sym' pam_systemd_c = files('pam_systemd.c') install_data('org.freedesktop.login1.conf', |