diff mbox series

glib-2.0: refresh gio-querymodules install path patch

Message ID 20260629153942.2661497-1-ross.burton@arm.com
State Under Review
Headers show
Series glib-2.0: refresh gio-querymodules install path patch | expand

Commit Message

Ross Burton June 29, 2026, 3:39 p.m. UTC 
This patch was badly rebased onto upstream changes and ended up setting
install_dir twice. Refresh the patch to change the existing value
instead of adding another.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 ...nstall-gio-querymodules-as-libexec_PROGRAM.patch | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/meta/recipes-core/glib-2.0/files/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch b/meta/recipes-core/glib-2.0/files/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
index 18d69c4a43e..6211c31c8f8 100644
--- a/meta/recipes-core/glib-2.0/files/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
+++ b/meta/recipes-core/glib-2.0/files/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
@@ -16,11 +16,12 @@  diff --git a/gio/meson.build b/gio/meson.build
 index a3e6f18..c7da257 100644
 --- a/gio/meson.build
 +++ b/gio/meson.build
-@@ -1071,6 +1071,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu
+@@ -1067,7 +1066,7 @@ executable('gresource', 'gresource-tool.c',
+
+ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodule-priv.c',
+   install : true,
+-  install_dir : multiarch_bindir,
++  install_dir : glib_libexecdir,
+   install_tag : 'bin',
    c_args : gio_c_args,
    # intl.lib is not compatible with SAFESEH
-   link_args : noseh_link_args,
-+  install_dir: glib_libexecdir,
-   dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep, app_profile_dep])
- 
- glib_compile_schemas = executable('glib-compile-schemas',