From 70764ff5f7e286c99782adf56df047ca3fb0f7c4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 23 Apr 2018 13:49:27 +0200 Subject: [PATCH] meson: add test-lib{systemd,udev}-static-sym This is the same as test-lib{systemd,udev}-sym, but linked to the static variants of those libraries. --- meson.build | 40 ++++++++++++++++++++++++++++++++++------ 1 file changed, 34 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 50a52c2e6..496dffe71 100644 --- a/meson.build +++ b/meson.build @@ -2843,17 +2843,32 @@ foreach tuple : tests endforeach #if 0 /// UNNEEDED by elogind -# test_libsystemd_sym = executable( +# exe = executable( # 'test-libsystemd-sym', # test_libsystemd_sym_c, # include_directories : includes, # link_with : [libsystemd], # install : install_tests, # install_dir : testsdir) -# test('test-libsystemd-sym', -# test_libsystemd_sym) +# test('test-libsystemd-sym', exe) # -# test_libudev_sym = executable( +# exe = executable( +# 'test-libsystemd-static-sym', +# test_libsystemd_sym_c, +# include_directories : includes, +# c_args : static_libsystemd_pic ? [] : ['-fno-PIC'], +# link_args : static_libsystemd_pic ? [] : ['-fno-PIC'], +# link_with : [install_libsystemd_static], +# dependencies : [threads], # threads is already included in dependencies on the library, +# # but does not seem to get propagated. Add here as a work-around. +# build_by_default : static_libsystemd != 'false', +# install : install_tests and static_libsystemd != 'false', +# install_dir : testsdir) +# if static_libsystemd != 'false' +# test('test-libsystemd-static-sym', exe) +# endif +# +# exe = executable( # 'test-libudev-sym', # test_libudev_sym_c, # include_directories : includes, @@ -2861,8 +2876,21 @@ endforeach # link_with : [libudev], # install : install_tests, # install_dir : testsdir) -# test('test-libudev-sym', -# test_libudev_sym) +# test('test-libudev-sym', exe) +# +# exe = executable( +# 'test-libudev-static-sym', +# test_libudev_sym_c, +# include_directories : includes, +# c_args : ['-Wno-deprecated-declarations'] + +# (static_libsystemd_pic ? [] : ['-fno-PIC']), +# link_with : [install_libudev_static], +# build_by_default : static_libudev != 'false', +# install : install_tests and static_libudev != 'false', +# install_dir : testsdir) +# if static_libudev != 'false' +# test('test-libudev-static-sym', exe) +# endif # # ############################################################ # -- 2.30.2