| Message ID | 20261102152246.3236176-1-khem.raj@oss.qualcomm.com |
|---|---|
| State | Under Review |
| Headers | show |
| Series | libx11: stage the X11 locale data in all sysroots | expand |
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.8.13.bb b/meta/recipes-graphics/xorg-lib/libx11_1.8.13.bb index 42f52f3de2..bb9538d3be 100644 --- a/meta/recipes-graphics/xorg-lib/libx11_1.8.13.bb +++ b/meta/recipes-graphics/xorg-lib/libx11_1.8.13.bb @@ -39,6 +39,6 @@ FILES:${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${datadir}/X11/ FILES:${PN}-xcb += "${libdir}/libX11-xcb.so.*" FILES:${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" -SYSROOT_DIRS_IGNORE:remove:class-target = "${datadir}/X11/locale" +SYSROOT_DIRS_IGNORE:remove = "${datadir}/X11/locale" BBCLASSEXTEND = "native nativesdk"
Commit 63204f5551 moved the X11 locale data from the native to the target sysroot for meson-based ibus 1.5.35. ibus 1.5.34, which is what meta-oe currently ships, still copies en_US.UTF-8/Compose from STAGING_DATADIR_NATIVE, so its do_compile now fails. On distros without x11 there is no target libx11 to provide the data either. Keep the directory in every sysroot so both ibus versions find it. Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com> --- meta/recipes-graphics/xorg-lib/libx11_1.8.13.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)