luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

meson: Don't accidentally pick up pcre2 fallback in the first test

Browse Source 
This test assumes that pcre2 is not provided by a subproject, so force
it to be that. Explicitly allow fallback in the next check (although
it's implied already).
This commit is contained in:
Nirbheek Chauhan 2022-12-30 16:44:36 +05:30
parent 6d9bff2874
commit 609d58beea
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meson.build
View File

@ -2038,7 +2038,8 @@ else
libiconv = dependency('iconv') libiconv = dependency('iconv')
endif endif
pcre2 = dependency('libpcre2-8', version: '>= 10.32', required : false) pcre2_req = '>=10.32'
pcre2 = dependency('libpcre2-8', version: pcre2_req, required: false, allow_fallback: false)
if not pcre2.found() if not pcre2.found()
if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl' if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl'
# MSVC: Search for the PCRE2 library by the configuration, which corresponds # MSVC: Search for the PCRE2 library by the configuration, which corresponds
@ -2054,7 +2055,7 @@ endif
# Try again with the fallback # Try again with the fallback
if not pcre2.found() if not pcre2.found()
pcre2 = dependency('libpcre2-8', required : true, fallback : ['pcre2', 'libpcre2_8']) pcre2 = dependency('libpcre2-8', version: pcre2_req, allow_fallback: true, fallback: ['pcre2', 'libpcre2_8'])
use_pcre2_static_flag = true use_pcre2_static_flag = true
elif host_system == 'windows' elif host_system == 'windows'
pcre2_static = cc.links('''#define PCRE2_STATIC pcre2_static = cc.links('''#define PCRE2_STATIC