glib fails to build on master (`ERROR: Tried to override dependency 'gio-2.0' which has already been resolved or overridden ...`)

[thesamesam]

Since 852a580, I see this when building glib-2.84.3:

/tmp/glib/glib-2.84.3 $ ~/git/meson/meson.py setup --wrap-mode nodownload -Db_pch=false -Dwerror=false -Dbuildtype=plain -Ddefault_library=both -Druntime_dir=/run -Dglib_debug=disabled -Dselinux=disabled -Dxattr=true -Dlibmount=enabled -Dman-pages=enabled -Ddtrace=disabled -Dsystemtap=disabled -Dsysprof=disabled -Ddocumentation=false -Dtests=true -Dinstalled_tests=false -Dnls=enabled -Doss_fuzz=disabled -Dlibelf=disabled -Dmultiarch=false -Dintrospection=disabled -Db_colorout=always build
[...]
Checking for type "struct ip_mreqn" : YES
Checking if "ioctl with request SIOCGIFADDR" compiles: YES
Configuring gnetworking.h using configuration
Configuring gdbus-codegen using configuration
Program gdbus-codegen found: YES (/tmp/glib/glib-2.84.3/build/gio/gdbus-2.0/codegen/gdbus-codegen)
Configuring config.py using configuration
Found CMake: /usr/bin/cmake (4.0.3)
Run-time dependency libinotify found: NO (tried pkgconfig and cmake)

gio/meson.build:932:6: ERROR: Tried to override dependency 'gio-2.0' which has already been resolved or overridden at /tmp/glib/glib-2.84.3/subprojects/gvdb/gvdb/tests/meson.build:7:

A full log can be found at /tmp/glib/glib-2.84.3/build/meson-logs/meson-log.txt

cc @bonzini

[thesamesam]

Console output: log.txt
meson-log.txt: meson-log.txt

[bonzini]

Uff, at least this one is easy

diff --git a/mesonbuild/options.py b/mesonbuild/options.py
index 4f51c38b7..2bea6037a 100644
--- a/mesonbuild/options.py
+++ b/mesonbuild/options.py
@@ -1378,8 +1378,9 @@ class OptionStore:
             options[key] = valstr
 
         # then global settings from machine file and command line
+        # **but not if they are toplevel project options**
         for key, valstr in itertools.chain(machine_file_options.items(), cmd_line_options.items()):
-            if key.subproject is None:
+            if key.subproject is None and not self.is_project_option(key.as_root()):
                 subp_key = key.evolve(subproject=subproject)
                 self.pending_options.pop(subp_key, None)
                 options.pop(subp_key, None)