Skip to content

Commit 242f248

Browse files
committed
libarchive: drop support for libpcre (not libpcre2), which is EOL
1 parent 58f546e commit 242f248

File tree

3 files changed

+2
-19
lines changed

3 files changed

+2
-19
lines changed

releases.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1714,6 +1714,7 @@
17141714
"libarchive"
17151715
],
17161716
"versions": [
1717+
"3.8.1-2",
17171718
"3.8.1-1",
17181719
"3.7.9-1",
17191720
"3.7.8-1",

subprojects/packagefiles/libarchive/meson.build

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -496,24 +496,6 @@ and cc.has_function(
496496
cdata.set('HAVE_REGEX_H', 1)
497497
break
498498
endif
499-
elif rx_support == 'libpcreposix'
500-
pcre_dep = dependency(
501-
'libpcreposix',
502-
disabler: true,
503-
required: false,
504-
)
505-
# Note: on macOS, Apple provides a system pcre with pkg-config but without headers…
506-
if cc.has_header(
507-
'pcreposix.h',
508-
dependencies: pcre_dep.partial_dependency(
509-
compile_args: true,
510-
includes: true,
511-
),
512-
)
513-
rx_dep = pcre_dep
514-
cdata.set('HAVE_PCREPOSIX_H', 1)
515-
break
516-
endif
517499
elif rx_support == 'libpcre2posix'
518500
pcre2_dep = dependency(
519501
'libpcre2-posix',

subprojects/packagefiles/libarchive/meson_options.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ option(
7575
option(
7676
'regex_provider',
7777
type: 'array',
78-
choices: ['libc', 'libregex', 'libpcreposix', 'libpcre2posix'],
78+
choices: ['libc', 'libregex', 'libpcre2posix'],
7979
description: 'Regex implementation to check for in preferred order',
8080
)
8181

0 commit comments

Comments
 (0)