Skip to content

Commit

Permalink
pcre2: update to 10.45
Browse files Browse the repository at this point in the history
  • Loading branch information
bgilbert committed Feb 11, 2025
1 parent deed408 commit 4c427ef
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 10 deletions.
1 change: 1 addition & 0 deletions releases.json
Original file line number Diff line number Diff line change
Expand Up @@ -2926,6 +2926,7 @@
"libpcre2-posix"
],
"versions": [
"10.45-1",
"10.44-2",
"10.44-1",
"10.43-1",
Expand Down
36 changes: 30 additions & 6 deletions subprojects/packagefiles/pcre2/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ project(
'c',
license: 'BSD-3',
meson_version: '>=0.49.0',
version: '10.44',
version: '10.45',
)

pcre2_8_lib_version = '0.13.0'
pcre2_16_lib_version = '0.13.0'
pcre2_32_lib_version = '0.13.0'
pcre2_posix_lib_version = '3.0.5'
pcre2_8_lib_version = '0.14.0'
pcre2_16_lib_version = '0.14.0'
pcre2_32_lib_version = '0.14.0'
pcre2_posix_lib_version = '3.0.6'

c_compiler = meson.get_compiler('c')

Expand All @@ -36,7 +36,7 @@ varr = meson.project_version().split('.')
pcredata.set('PCRE2_MAJOR', varr[0])
pcredata.set('PCRE2_MINOR', varr[1])
pcredata.set('PCRE2_PRERELEASE', '')
pcredata.set('PCRE2_DATE', '2024-06-07')
pcredata.set('PCRE2_DATE', '2025-02-05')

# config.h
cdata = configuration_data()
Expand Down Expand Up @@ -80,6 +80,7 @@ sources = files(
'src/pcre2_auto_possess.c',
'src/pcre2_chkdint.c',
'src/pcre2_compile.c',
'src/pcre2_compile_class.c',
'src/pcre2_config.c',
'src/pcre2_context.c',
'src/pcre2_convert.c',
Expand Down Expand Up @@ -111,6 +112,7 @@ includes = include_directories('.', 'src')
check_headers = [
'sys/stat.h',
'sys/types.h',
'assert.h',
'dirent.h',
'windows.h',
'unistd.h',
Expand All @@ -124,6 +126,7 @@ endforeach

check_funs = [
'__builtin_mul_overflow',
'__builtin_unreachable',
'bcopy',
'memfd_create',
'memmove',
Expand All @@ -138,6 +141,23 @@ foreach f : check_funs
endif
endforeach

if c_compiler.links('''
int main() {
__assume(0);
}
''')
cdata.set10('HAVE_BUILTIN_ASSUME', true)
endif

if c_compiler.compiles('''
int main() {
char buf[128] __attribute__((uninitialized));
(void)buf;
}
''')
cdata.set10('HAVE_ATTRIBUTE_UNINITIALIZED', true)
endif

cdata.set10('SUPPORT_PCRE2_8', true)
cdata.set10('SUPPORT_PCRE2_16', true)
cdata.set10('SUPPORT_PCRE2_32', true)
Expand Down Expand Up @@ -170,6 +190,10 @@ config_h = configure_file(
)

general_c_args = [static_defs, '-DHAVE_CONFIG_H', '-D_GNU_SOURCE']
if host_machine.system() == 'windows'
general_c_args += ['-D_CRT_SECURE_NO_DEPRECATE', '-D_CRT_SECURE_NO_WARNINGS']
endif

pcre2_8_lib = library(
'pcre2-8',
sources,
Expand Down
8 changes: 4 additions & 4 deletions subprojects/pcre2.wrap
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[wrap-file]
directory = pcre2-10.44
source_url = https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.44/pcre2-10.44.tar.bz2
source_filename = pcre2-10.44.tar.bz2
source_hash = d34f02e113cf7193a1ebf2770d3ac527088d485d4e047ed10e5d217c6ef5de96
directory = pcre2-10.45
source_url = https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.45/pcre2-10.45.tar.bz2
source_filename = pcre2-10.45.tar.bz2
source_hash = 21547f3516120c75597e5b30a992e27a592a31950b5140e7b8bfde3f192033c4
patch_directory = pcre2

[provide]
Expand Down

0 comments on commit 4c427ef

Please sign in to comment.