Skip to content

Commit e4b127e

Browse files
yuwatayuwata
committed
meson: do not link with libudev
1 parent 1403fe2 commit e4b127e

File tree

6 files changed

+36
-44
lines changed

6 files changed

+36
-44
lines changed

‎meson.build‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1577,7 +1577,6 @@ includes = include_directories('src/basic',
15771577
'src/libsystemd/sd-netlink',
15781578
'src/libsystemd/sd-network',
15791579
'src/libsystemd/sd-resolve',
1580-
'src/libudev',
15811580
'src/login',
15821581
'src/nspawn',
15831582
'src/resolve',
@@ -3162,7 +3161,7 @@ if conf.get('ENABLE_HWDB') == 1
31623161
'src/hwdb/hwdb.c',
31633162
'src/libsystemd/sd-hwdb/hwdb-internal.h',
31643163
include_directories : includes,
3165-
link_with : [libudev_static],
3164+
link_with : udev_link_with,
31663165
install_rpath : udev_rpath,
31673166
install : true,
31683167
install_dir : rootbindir)
@@ -3194,8 +3193,7 @@ public_programs += executable(
31943193
udevadm_sources,
31953194
c_args : '-DLOG_REALM=LOG_REALM_UDEV',
31963195
include_directories : includes,
3197-
link_with : [libudev_core,
3198-
libudev_static],
3196+
link_with : [libudevd_core],
31993197
dependencies : [versiondep,
32003198
threads,
32013199
libkmod,
@@ -3274,7 +3272,6 @@ if conf.get('ENABLE_NETWORKD') == 1
32743272
include_directories : network_include_dir,
32753273
link_with : [libnetworkd_core,
32763274
libsystemd_network,
3277-
libudev_static,
32783275
networkd_link_with],
32793276
dependencies : [threads],
32803277
install_rpath : rootlibexecdir,
@@ -3412,7 +3409,7 @@ endif
34123409
exe = executable(
34133410
'test-libudev-sym',
34143411
test_libudev_sym_c,
3415-
include_directories : includes,
3412+
include_directories : libudev_includes,
34163413
c_args : '-Wno-deprecated-declarations',
34173414
link_with : [libudev],
34183415
build_by_default : want_tests != 'false',
@@ -3425,7 +3422,7 @@ endif
34253422
exe = executable(
34263423
'test-libudev-static-sym',
34273424
test_libudev_sym_c,
3428-
include_directories : includes,
3425+
include_directories : libudev_includes,
34293426
c_args : '-Wno-deprecated-declarations',
34303427
link_with : [install_libudev_static],
34313428
build_by_default : want_tests != 'false' and static_libudev_pic,

‎src/fuzz/meson.build‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,7 @@ fuzzers += [
106106
[]],
107107

108108
[['src/fuzz/fuzz-udev-rules.c'],
109-
[libudev_core,
110-
libudev_static,
109+
[libudevd_core,
111110
libshared],
112111
[threads,
113112
libacl]],

‎src/network/meson.build‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,6 @@ if conf.get('ENABLE_NETWORKD') == 1
244244
[['src/network/fuzz-netdev-parser.c',
245245
'src/fuzz/fuzz.h'],
246246
[libnetworkd_core,
247-
libudev_static,
248247
libsystemd_network,
249248
networkd_link_with],
250249
[threads],
@@ -254,7 +253,6 @@ if conf.get('ENABLE_NETWORKD') == 1
254253
[['src/network/fuzz-network-parser.c',
255254
'src/fuzz/fuzz.h'],
256255
[libnetworkd_core,
257-
libudev_static,
258256
libsystemd_network,
259257
networkd_link_with],
260258
[threads],
@@ -265,28 +263,24 @@ if conf.get('ENABLE_NETWORKD') == 1
265263
tests += [
266264
[['src/network/test-networkd-conf.c'],
267265
[libnetworkd_core,
268-
libsystemd_network,
269-
libudev],
266+
libsystemd_network],
270267
[], '', '', [], network_include_dir],
271268

272269
[['src/network/test-network.c'],
273270
[libnetworkd_core,
274-
libudev_static,
275271
libsystemd_network,
276272
networkd_link_with],
277273
[threads],
278274
'', '', [], network_include_dir],
279275

280276
[['src/network/test-routing-policy-rule.c'],
281277
[libnetworkd_core,
282-
libsystemd_network,
283-
libudev],
278+
libsystemd_network],
284279
[], '', '', [], network_include_dir],
285280

286281
[['src/network/test-network-tables.c',
287282
test_tables_h],
288283
[libnetworkd_core,
289-
libudev_static,
290284
libsystemd_network,
291285
networkd_link_with],
292286
[threads],

‎src/shared/meson.build‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,6 @@ libshared_static = static_library(
383383

384384
libshared = shared_library(
385385
libshared_name,
386-
libudev_sources,
387386
include_directories : includes,
388387
link_args : ['-shared',
389388
'-Wl,--version-script=' + libshared_sym_path],

‎src/test/meson.build‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ tests += [
5252

5353
[['src/test/test-engine.c'],
5454
[libcore,
55-
libudev,
5655
libshared],
5756
[threads,
5857
librt,
@@ -520,16 +519,15 @@ tests += [
520519
'src/journal/journald-server.h'],
521520
[libcore,
522521
libjournal_core,
523-
libudev_core,
524-
libudev_static,
522+
libudevd_core,
525523
libshared],
526524
[threads,
527525
libseccomp,
528526
libmount,
529527
libxz,
530528
liblz4,
531529
libblkid],
532-
'', '', [], libudev_core_includes],
530+
'', '', [], libudevd_core_includes],
533531

534532
[['src/test/test-prioq.c'],
535533
[],
@@ -751,12 +749,13 @@ tests += [
751749
[]],
752750

753751
[['src/test/test-libudev.c'],
754-
[libshared],
755-
[]],
752+
[libshared,
753+
libudev_static],
754+
[],
755+
'', '', [], libudev_includes],
756756

757757
[['src/test/test-udev.c'],
758-
[libudev_core,
759-
libudev_static,
758+
[libudevd_core,
760759
libshared],
761760
[threads,
762761
librt,
@@ -1067,7 +1066,8 @@ tests += [
10671066
[libbasic,
10681067
libshared_static,
10691068
libudev],
1070-
[threads]],
1069+
[threads],
1070+
'', '', [], libudev_includes],
10711071

10721072
[['src/libsystemd/sd-device/test-sd-device-monitor.c'],
10731073
[],

‎src/udev/meson.build‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ udevadm_sources = files('''
1616
udevd.c
1717
'''.split())
1818

19-
libudev_core_sources = '''
19+
libudevd_core_sources = '''
2020
udev-ctrl.c
2121
udev-ctrl.h
2222
udev-event.c
@@ -42,17 +42,17 @@ libudev_core_sources = '''
4242
'''.split()
4343

4444
if conf.get('HAVE_KMOD') == 1
45-
libudev_core_sources += ['udev-builtin-kmod.c']
45+
libudevd_core_sources += ['udev-builtin-kmod.c']
4646
endif
4747

4848
if conf.get('HAVE_BLKID') == 1
49-
libudev_core_sources += ['udev-builtin-blkid.c']
49+
libudevd_core_sources += ['udev-builtin-blkid.c']
5050
endif
5151

5252
if conf.get('HAVE_ACL') == 1
53-
libudev_core_sources += ['udev-builtin-uaccess.c',
54-
logind_acl_c,
55-
sd_login_sources]
53+
libudevd_core_sources += ['udev-builtin-uaccess.c',
54+
logind_acl_c,
55+
sd_login_sources]
5656
endif
5757

5858
############################################################
@@ -105,15 +105,17 @@ else
105105
udev_rpath = ''
106106
endif
107107

108+
libudev_includes = [includes, include_directories('../libudev')]
109+
108110
libudev_basic = static_library(
109111
'udev-basic',
110112
libudev_sources,
111-
include_directories : includes,
113+
include_directories : libudev_includes,
112114
c_args : ['-fvisibility=default'])
113115

114116
libudev_static = static_library(
115117
'udev_static',
116-
include_directories : includes,
118+
include_directories : libudev_includes,
117119
link_with : udev_link_with,
118120
link_whole : libudev_basic)
119121

@@ -126,7 +128,7 @@ install_libudev_static = static_library(
126128
libsystemd_sources,
127129
libudev_sources,
128130
disable_mempool_c,
129-
include_directories : includes,
131+
include_directories : libudev_includes,
130132
build_by_default : static_libudev != 'false',
131133
install : static_libudev != 'false',
132134
install_dir : rootlibdir,
@@ -139,7 +141,7 @@ libudev = shared_library(
139141
'udev',
140142
disable_mempool_c,
141143
version : libudev_version,
142-
include_directories : includes,
144+
include_directories : libudev_includes,
143145
link_args : ['-shared',
144146
'-Wl,--version-script=' + libudev_sym_path],
145147
link_with : [libsystemd_static, libshared_static],
@@ -149,13 +151,15 @@ libudev = shared_library(
149151
install : true,
150152
install_dir : rootlibdir)
151153

152-
libudev_core_includes = [includes, include_directories('net')]
153-
libudev_core = static_library(
154+
############################################################
155+
156+
libudevd_core_includes = [includes, include_directories('net')]
157+
libudevd_core = static_library(
154158
'udev-core',
155-
libudev_core_sources,
159+
libudevd_core_sources,
156160
link_config_gperf_c,
157161
keyboard_keys_from_name_h,
158-
include_directories : libudev_core_includes,
162+
include_directories : libudevd_core_includes,
159163
c_args : ['-DLOG_REALM=LOG_REALM_UDEV'],
160164
link_with : udev_link_with,
161165
dependencies : [libblkid, libkmod])
@@ -179,7 +183,7 @@ foreach prog : [['ata_id/ata_id.c'],
179183
include_directories : includes,
180184
c_args : ['-DLOG_REALM=LOG_REALM_UDEV'],
181185
dependencies : [versiondep],
182-
link_with : [libudev_static],
186+
link_with : udev_link_with,
183187
install_rpath : udev_rpath,
184188
install : true,
185189
install_dir : udevlibexecdir)
@@ -204,8 +208,7 @@ endif
204208
fuzzers += [
205209
[['src/udev/net/fuzz-link-parser.c',
206210
'src/fuzz/fuzz.h'],
207-
[libudev_core,
208-
libudev_static,
211+
[libudevd_core,
209212
libshared],
210213
[threads,
211214
libacl]],

0 commit comments

Comments
 (0)