luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-30 12:23:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'backport-2309-pcre-blah-blah-glib-2-70' into 'glib-2-70'

Browse Source 
Backport !2309 “Rename libpcre.wrap to pcre.wrap” to glib-2-70

See merge request GNOME/glib!2316
This commit is contained in:
Xavier Claessens 2021-11-11 17:00:37 +00:00
commit 397f8b6253
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
View File

@ -1999,7 +1999,7 @@ endif
# Try again with the fallback
if not pcre.found()
pcre = dependency('libpcre', required : true, fallback : ['libpcre', 'pcre_dep'])
pcre = dependency('libpcre', required : true, fallback : ['pcre', 'pcre_dep'])
use_pcre_static_flag = true
elif host_system == 'windows'
pcre_static = cc.links('''#define PCRE_STATIC

1
subprojects/libpcre.wrap → subprojects/pcre.wrap
View File

@ -9,3 +9,4 @@ patch_hash = 6b80f72385e1bf06721e26fbc83aced576e9c0d3182d86a55dd173a04050fe26
[provide]
libpcre = pcre_dep