luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-01 21:33:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

meson: Don't use outdated 'fallback:' kwarg to dependency()

Browse Source 
The mapping is done using the wrap file now. Also update the libffi
and pcre2 subprojects at the same time.

Reported by Benjamin Gilbert at
https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3172
This commit is contained in:
Nirbheek Chauhan 2022-12-30 16:46:12 +05:30
parent 609d58beea
commit a395a7ab3d
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meson.build
View File

@ -2055,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', version: pcre2_req, allow_fallback: true, fallback: ['pcre2', 'libpcre2_8']) pcre2 = dependency('libpcre2-8', version: pcre2_req, allow_fallback: true)
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
@ -2078,7 +2078,7 @@ subproject('gvdb')
gvdb_dep = dependency('gvdb') gvdb_dep = dependency('gvdb')
libm = cc.find_library('m', required : false) libm = cc.find_library('m', required : false)
libffi_dep = dependency('libffi', version : '>= 3.0.0', fallback : ['libffi', 'ffi_dep']) libffi_dep = dependency('libffi', version : '>= 3.0.0')
libz_dep = dependency('zlib') libz_dep = dependency('zlib')

3
subprojects/libffi.wrap
View File

@ -3,3 +3,6 @@ directory=libffi
url=https://gitlab.freedesktop.org/gstreamer/meson-ports/libffi.git url=https://gitlab.freedesktop.org/gstreamer/meson-ports/libffi.git
revision=meson revision=meson
depth=1 depth=1
[provide]
libffi = ffi_dep

24
subprojects/pcre2.wrap
View File

@ -1,15 +1,15 @@
[wrap-file] [wrap-file]
directory = pcre2-10.40 directory = pcre2-10.42
source_url = https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.40/pcre2-10.40.tar.bz2 source_url = https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.42/pcre2-10.42.tar.bz2
source_filename = pcre2-10.40.tar.bz2 source_filename = pcre2-10.42.tar.bz2
source_hash = 14e4b83c4783933dc17e964318e6324f7cae1bc75d8f3c79bc6969f00c159d68 source_hash = 8d36cd8cb6ea2a4c2bb358ff6411b0c788633a2a45dabbf1aeb4b701d1b5e840
patch_filename = pcre2_10.40-3_patch.zip patch_filename = pcre2_10.42-2_patch.zip
patch_url = https://wrapdb.mesonbuild.com/v2/pcre2_10.40-3/get_patch patch_url = https://wrapdb.mesonbuild.com/v2/pcre2_10.42-2/get_patch
patch_hash = 95391923529b4c1647a2cf88cd3b59cceb4f92393775e011f530e7865de0c7fb patch_hash = 350dc342b81a1611af43e5cc23f1b10453c7df51d5bb60ab9ee247daf03802bc
wrapdb_version = 10.40-3 wrapdb_version = 10.42-2
[provide] [provide]
libpcre2-8 = -libpcre2_8 libpcre2-8 = libpcre2_8
libpcre2-16 = -libpcre2_16 libpcre2-16 = libpcre2_16
libpcre2-32 = -libpcre2_32 libpcre2-32 = libpcre2_32
libpcre2-posix = -libpcre2_posix libpcre2-posix = libpcre2_posix