Skip to contentSkip to conversation

libx11: stage the X11 locale data in all sysroots

PATCH In review Khem Raj 2 participants 2 messages Nov 2 – Nov 5

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 libx11: stage the X11 locale data in all sysroots

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.

---
 meta/recipes-graphics/xorg-lib/libx11_1.8.13.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/xorg-lib/libx11_1.8.13.bb +1 -1
index 42f52f3de2..bb9538d3be 100644
@@ -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"
#1 lore raw

Review

Quoted 3 lines · Khem Raj via openembedded-core
(quoted diff) +1 -1
-SYSROOT_DIRS_IGNORE:remove:class-target = "${datadir}/X11/locale"
+SYSROOT_DIRS_IGNORE:remove = "${datadir}/X11/locale”

This recipe is the only one that ships these files, so I’d suggest just removing the entry from staging.bbclass instead.

Ross