mirror of
https://github.com/systemd/systemd.git
synced 2024-10-27 10:25:37 +03:00
meson: only build test-lib{systemd,udev}-static-sym for pic
This commit is contained in:
parent
0632b4cd36
commit
20f3d32d8d
17
meson.build
17
meson.build
@ -2564,15 +2564,13 @@ exe = executable(
|
|||||||
'test-libsystemd-static-sym',
|
'test-libsystemd-static-sym',
|
||||||
test_libsystemd_sym_c,
|
test_libsystemd_sym_c,
|
||||||
include_directories : includes,
|
include_directories : includes,
|
||||||
c_args : static_libsystemd_pic ? [] : ['-fno-PIC'],
|
|
||||||
link_args : static_libsystemd_pic ? [] : ['-fno-PIC'],
|
|
||||||
link_with : [install_libsystemd_static],
|
link_with : [install_libsystemd_static],
|
||||||
dependencies : [threads], # threads is already included in dependencies on the library,
|
dependencies : [threads], # threads is already included in dependencies on the library,
|
||||||
# but does not seem to get propagated. Add here as a work-around.
|
# but does not seem to get propagated. Add here as a work-around.
|
||||||
build_by_default : static_libsystemd != 'false',
|
build_by_default : static_libsystemd_pic,
|
||||||
install : install_tests and static_libsystemd != 'false',
|
install : install_tests and static_libsystemd_pic,
|
||||||
install_dir : testsdir)
|
install_dir : testsdir)
|
||||||
if static_libsystemd != 'false'
|
if static_libsystemd_pic
|
||||||
test('test-libsystemd-static-sym', exe)
|
test('test-libsystemd-static-sym', exe)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@ -2590,13 +2588,12 @@ exe = executable(
|
|||||||
'test-libudev-static-sym',
|
'test-libudev-static-sym',
|
||||||
test_libudev_sym_c,
|
test_libudev_sym_c,
|
||||||
include_directories : includes,
|
include_directories : includes,
|
||||||
c_args : ['-Wno-deprecated-declarations'] +
|
c_args : ['-Wno-deprecated-declarations'],
|
||||||
(static_libsystemd_pic ? [] : ['-fno-PIC']),
|
|
||||||
link_with : [install_libudev_static],
|
link_with : [install_libudev_static],
|
||||||
build_by_default : static_libudev != 'false',
|
build_by_default : static_libudev_pic,
|
||||||
install : install_tests and static_libudev != 'false',
|
install : install_tests and static_libudev_pic,
|
||||||
install_dir : testsdir)
|
install_dir : testsdir)
|
||||||
if static_libudev != 'false'
|
if static_libudev_pic
|
||||||
test('test-libudev-static-sym', exe)
|
test('test-libudev-static-sym', exe)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -118,6 +118,7 @@ libudev_static = static_library(
|
|||||||
link_whole : libudev_basic)
|
link_whole : libudev_basic)
|
||||||
|
|
||||||
static_libudev = get_option('static-libudev')
|
static_libudev = get_option('static-libudev')
|
||||||
|
static_libudev_pic = static_libudev == 'true' or static_libudev == 'pic'
|
||||||
install_libudev_static = static_library(
|
install_libudev_static = static_library(
|
||||||
'udev',
|
'udev',
|
||||||
libudev_sources,
|
libudev_sources,
|
||||||
@ -130,7 +131,8 @@ install_libudev_static = static_library(
|
|||||||
install_dir : rootlibdir,
|
install_dir : rootlibdir,
|
||||||
link_depends : libudev_sym,
|
link_depends : libudev_sym,
|
||||||
dependencies : [threads],
|
dependencies : [threads],
|
||||||
pic : static_libudev == 'true' or static_libudev == 'pic')
|
c_args : static_libudev_pic ? [] : ['-fno-PIC'],
|
||||||
|
pic : static_libudev_pic)
|
||||||
|
|
||||||
libudev = shared_library(
|
libudev = shared_library(
|
||||||
'udev',
|
'udev',
|
||||||
|
Loading…
Reference in New Issue
Block a user