brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Don't override prefix

Browse Source 
Meson variables don't have a scope, so using `prefix` in a loop
for D-Bus interface prefixes actually overshadows the global
variable that holds the build prefix.

As far as I can tell, the only place where the "wrong" value is
read is the build summary, but let's not tempt fate and fix it.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3995>
This commit is contained in:
Florian Müllner 2024-09-02 01:07:39 +02:00
parent 6f9981d36a
commit b0e90c6523
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/meson.build
View File

@ -1056,7 +1056,7 @@ foreach dbus_interface: dbus_interfaces
endif endif
interface_file = directory / interface interface_file = directory / interface
prefix = dbus_interface['prefix'] interface_prefix = dbus_interface['prefix']
if dbus_interface.has_key('object_manager') if dbus_interface.has_key('object_manager')
object_manager = dbus_interface['object_manager'] object_manager = dbus_interface['object_manager']
@ -1065,7 +1065,7 @@ foreach dbus_interface: dbus_interfaces
endif endif
dbus_sources = gnome.gdbus_codegen(name, interface_file, dbus_sources = gnome.gdbus_codegen(name, interface_file,
interface_prefix: prefix, interface_prefix: interface_prefix,
namespace: 'MetaDBus', namespace: 'MetaDBus',
object_manager: object_manager, object_manager: object_manager,
) )