diff options
Diffstat (limited to 'dev-build/meson/files/0001-Only-convert-boolean-values-for-cmake-formats.patch')
-rw-r--r-- | dev-build/meson/files/0001-Only-convert-boolean-values-for-cmake-formats.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/dev-build/meson/files/0001-Only-convert-boolean-values-for-cmake-formats.patch b/dev-build/meson/files/0001-Only-convert-boolean-values-for-cmake-formats.patch deleted file mode 100644 index 394b1bbb7c1b..000000000000 --- a/dev-build/meson/files/0001-Only-convert-boolean-values-for-cmake-formats.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 9016e6958bb83feb9a724f20d8badb116bf7c5f2 Mon Sep 17 00:00:00 2001 -From: Jan200101 <sentrycraft123@gmail.com> -Date: Tue, 21 Nov 2023 08:42:56 +0100 -Subject: [PATCH] Only convert boolean values for cmake formats - -This caused a regression with mesondefine where - `conf_data.set("FOO", true)` -turned into - `#define FOO 1` -instead of - `#define FOO` ---- - mesonbuild/utils/universal.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mesonbuild/utils/universal.py b/mesonbuild/utils/universal.py -index 26194628c..93e64c0a2 100644 ---- a/mesonbuild/utils/universal.py -+++ b/mesonbuild/utils/universal.py -@@ -1210,7 +1210,7 @@ def do_replacement(regex: T.Pattern[str], line: str, - var, _ = confdata.get(varname) - if isinstance(var, str): - var_str = var -- elif isinstance(var, bool): -+ elif variable_format.startswith("cmake") and isinstance(var, bool): - var_str = str(int(var)) - elif isinstance(var, int): - var_str = str(var) --- -2.41.0 - |