diff options
| author |   Eli Schwartz <eschwartz93@gmail.com> | 2023-12-02 19:53:47 -0500 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2023-12-03 01:05:44 +0000 |
| commit | 2556ee17fb54aea6c0b6d766f239db009f7b57fc (patch) | |
| tree | 8666a16aaf75026e277c3410b80a402bc012bf13 | |
| parent | sys-apps/dbus-broker: filter -fno-semantic-interposition (diff) | |
| download | gentoo-2556ee17fb54aea6c0b6d766f239db009f7b57fc.tar.gz gentoo-2556ee17fb54aea6c0b6d766f239db009f7b57fc.tar.bz2 gentoo-2556ee17fb54aea6c0b6d766f239db009f7b57fc.zip | |
dev-util/meson: backport fix for broken configure_file output
This broke portage itself.
Bug: https://github.com/mesonbuild/meson/pull/12532
Bug: https://bugs.gentoo.org/919072
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Sam James <sam@gentoo.org>
| -rw-r--r-- | dev-util/meson/files/0001-Only-convert-boolean-values-for-cmake-formats.patch | 31 | ||||
| -rw-r--r-- | dev-util/meson/meson-1.3.0-r1.ebuild (renamed from dev-util/meson/meson-1.3.0.ebuild) | 3 |
2 files changed, 34 insertions, 0 deletions
diff --git a/dev-util/meson/files/0001-Only-convert-boolean-values-for-cmake-formats.patch b/dev-util/meson/files/0001-Only-convert-boolean-values-for-cmake-formats.patch new file mode 100644 index 000000000000..394b1bbb7c1b --- /dev/null +++ b/dev-util/meson/files/0001-Only-convert-boolean-values-for-cmake-formats.patch @@ -0,0 +1,31 @@ +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 + diff --git a/dev-util/meson/meson-1.3.0.ebuild b/dev-util/meson/meson-1.3.0-r1.ebuild index 429bfd5ba7d3..1621828da199 100644 --- a/dev-util/meson/meson-1.3.0.ebuild +++ b/dev-util/meson/meson-1.3.0-r1.ebuild @@ -54,6 +54,9 @@ RDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-1.2.1-python-path.patch + + # backport fix for broken configure_file() + "${FILESDIR}"/0001-Only-convert-boolean-values-for-cmake-formats.patch ) python_prepare_all() { |