| Message ID | 20260924003841.1113450-2-khem.raj@oss.qualcomm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-gnome,1/2] ibus: remove bundled vapigen.m4 again | expand |
diff --git a/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.20.1.bb b/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.20.1.bb index 22f1ec28c3..44a4308899 100644 --- a/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.20.1.bb +++ b/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.20.1.bb @@ -7,4 +7,9 @@ DEPENDS = "intltool-native xfce4-dev-tools-native glib-2.0" inherit xfce gtk-doc gobject-introspection vala +do_configure:prepend() { + # Remove vapigen.m4 bundled with sources so that the one shipped by vala is used instead. + rm -f ${S}/m4/vapigen.m4 +} + SRC_URI[sha256sum] = "84bfc4daab9e466193540c3665eee42b2cf4d24e3f38fc3e8d1e0a2bebe3b8f1"
Commit c175507f1c ("classes/vala: remove obsolete logic") in oe-core dropped the removal of vapigen.m4 bundled with sources. The copy shipped in the libxfce4util tarball does not prefix the paths it reads from vapigen.pc with PKG_CONFIG_SYSROOT_DIR, and since it is found first via AC_CONFIG_MACRO_DIRS([m4]) it takes precedence over the one from vala. VAPIGEN and VAPIGEN_MAKEFILE then point to the build host, libxfce4util-1.0.vapi is never generated and do_install fails in install-vapiDATA. Remove it so that the one shipped by vala is used instead. AI-Generated: Uses Claude Code Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com> --- meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.20.1.bb | 5 +++++ 1 file changed, 5 insertions(+)