[glib/backport-2309-pcre-blah-blah-glib-2-70] Rename libpcre.wrap to pcre.wrap
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/backport-2309-pcre-blah-blah-glib-2-70] Rename libpcre.wrap to pcre.wrap
- Date: Mon, 1 Nov 2021 18:25:06 +0000 (UTC)
commit 562295c28620489dbaa1a9d22bd5c63ed6b8b7b7
Author: Xavier Claessens <xavier claessens collabora com>
Date: Thu Oct 21 11:09:57 2021 -0400
Rename libpcre.wrap to pcre.wrap
It is exactly the same wrap as the one in WrapDB but with a different
name. That fix error when multiple projects uses pcre and they don't
have the same wrap name:
meson.build:1:0: ERROR: Multiple wrap files provide 'libpcre' dependency: pcre.wrap and libpcre.wrap
meson.build | 2 +-
subprojects/{libpcre.wrap => pcre.wrap} | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/meson.build b/meson.build
index 2b08f56ad..a37b945c6 100644
--- a/meson.build
+++ b/meson.build
@@ -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
diff --git a/subprojects/libpcre.wrap b/subprojects/pcre.wrap
similarity index 99%
rename from subprojects/libpcre.wrap
rename to subprojects/pcre.wrap
index e27a198ec..ecae8ae8a 100644
--- a/subprojects/libpcre.wrap
+++ b/subprojects/pcre.wrap
@@ -9,3 +9,4 @@ patch_hash = 6b80f72385e1bf06721e26fbc83aced576e9c0d3182d86a55dd173a04050fe26
[provide]
libpcre = pcre_dep
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]