Skip to content

Commit e891c0a

Browse files
committed
libarchive: drop disablers
They aren't actually needed: all users of the dependency objects are either a cc.has_header() or cc.has_function() check or gated by a .found() test.
1 parent a41e112 commit e891c0a

File tree

1 file changed

+0
-11
lines changed

1 file changed

+0
-11
lines changed

subprojects/packagefiles/libarchive/meson.build

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,6 @@ endif
284284

285285
attr_dep = dependency(
286286
'libattr',
287-
disabler: true,
288287
required: get_option('xattr'),
289288
)
290289
if attr_dep.found()
@@ -298,7 +297,6 @@ endif
298297
# compression dependencies
299298
zlib_dep = dependency(
300299
'zlib',
301-
disabler: true,
302300
required: get_option('zlib'),
303301
)
304302
if zlib_dep.found()
@@ -309,7 +307,6 @@ endif
309307

310308
bz2_dep = dependency(
311309
'bzip2',
312-
disabler: true,
313310
required: get_option('bz2lib'),
314311
)
315312
if bz2_dep.found()
@@ -319,7 +316,6 @@ endif
319316

320317
b2_dep = dependency(
321318
'libb2',
322-
disabler: true,
323319
required: get_option('libb2'),
324320
)
325321
if b2_dep.found()
@@ -332,7 +328,6 @@ endif
332328

333329
lz4_dep = dependency(
334330
'liblz4',
335-
disabler: true,
336331
required: get_option('lz4'),
337332
)
338333
if lz4_dep.found()
@@ -342,7 +337,6 @@ endif
342337

343338
zstd_dep = dependency(
344339
'libzstd',
345-
disabler: true,
346340
required: get_option('zstd'),
347341
)
348342
if zstd_dep.found()
@@ -362,7 +356,6 @@ endif
362356

363357
lzma_dep = dependency(
364358
'liblzma',
365-
disabler: true,
366359
required: get_option('lzma'),
367360
)
368361
if lzma_dep.found()
@@ -436,7 +429,6 @@ endif
436429
if meson.version().version_compare('>= 0.60')
437430
iconv_dep = dependency(
438431
'iconv',
439-
disabler: true,
440432
required: get_option('iconv'),
441433
)
442434
elif get_option('iconv').enabled()
@@ -485,7 +477,6 @@ if not get_option('regex').disabled()
485477
elif rx_support == 'libregex'
486478
regex_dep = cc.find_library(
487479
'regex',
488-
disabler: true,
489480
required: false,
490481
)
491482
if cc.has_function(
@@ -500,7 +491,6 @@ if not get_option('regex').disabled()
500491
elif rx_support == 'libpcre2posix'
501492
pcre2_dep = dependency(
502493
'libpcre2-posix',
503-
disabler: true,
504494
required: false,
505495
)
506496
if pcre2_dep.found()
@@ -521,7 +511,6 @@ deps += rx_dep
521511

522512
libacl_dep = dependency(
523513
'libacl',
524-
disabler: true,
525514
required: get_option('acl'),
526515
)
527516
if libacl_dep.found()

0 commit comments

Comments
 (0)