|
 |
26d557 |
From 783c55103daac6240dd4117a14873df0ac038cf6 Mon Sep 17 00:00:00 2001
|
|
|
26d557 |
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
26d557 |
Date: Thu, 3 Nov 2022 12:13:10 +0100
|
|
|
26d557 |
Subject: [PATCH 8/9] Revert "use shared implementation to convert files()
|
|
|
26d557 |
strings to File objects"
|
|
|
26d557 |
Content-Type: text/plain
|
|
|
26d557 |
|
|
|
26d557 |
This reverts commit e6e8159980e9a4c816223fcdac8c729d104c0c02.
|
|
|
26d557 |
It causes a failure to build gtk-vnc.
|
|
|
26d557 |
---
|
|
|
26d557 |
mesonbuild/interpreter/interpreter.py | 2 +-
|
|
|
26d557 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
26d557 |
|
|
|
26d557 |
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py
|
|
|
26d557 |
index b52a55890..caf28f8bd 100644
|
|
|
26d557 |
--- a/mesonbuild/interpreter/interpreter.py
|
|
|
26d557 |
+++ b/mesonbuild/interpreter/interpreter.py
|
|
|
26d557 |
@@ -645,7 +645,7 @@ class Interpreter(InterpreterBase, HoldableObject):
|
|
|
26d557 |
@typed_pos_args('files', varargs=str)
|
|
|
26d557 |
@noKwargs
|
|
|
26d557 |
def func_files(self, node: mparser.FunctionNode, args: T.Tuple[T.List[str]], kwargs: 'TYPE_kwargs') -> T.List[mesonlib.File]:
|
|
|
26d557 |
- return self.source_strings_to_files(args[0])
|
|
|
26d557 |
+ return [mesonlib.File.from_source_file(self.environment.source_dir, self.subdir, fname) for fname in args[0]]
|
|
|
26d557 |
|
|
|
26d557 |
# Used by pkgconfig.generate()
|
|
|
26d557 |
def extract_variables(self, kwargs: T.Dict[str, T.Union[T.Dict[str, str], T.List[str], str]],
|
|
|
26d557 |
--
|
|
|
26d557 |
2.38.1
|
|
|
26d557 |
|