From 6768d0d7988294769a41c7ba40f29874366da00f Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 22 Jan 2020 17:37:48 +0000 Subject: libx11: squash whitespace in generated files The locale data in the recipe is generated using cpp, which results in differing amounts of whitespace depending on what compiler is used. This means that the files may differ in just whitespace, which is sufficient for RPM's multilib code to consider them different and not allow lib32-libx11-locale and lib64-libx11-locale to be installed at the same time. [ YOCTO #13647 ] Signed-off-by: Ross Burton --- meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb') diff --git a/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb b/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb index cabb84e686..3d97ad78d2 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb +++ b/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb @@ -14,7 +14,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" SRC_URI[md5sum] = "c5fa5a86a20e3591bed6c046498d4b8f" SRC_URI[sha256sum] = "b289a845c189e251e0e884cc0f9269bbe97c238df3741e854ec4c17c21e473d5" -SRC_URI += "file://0001-Drop-x11-dependencies.patch" +SRC_URI += "file://0001-Drop-x11-dependencies.patch \ + file://libx11-whitespace.patch" XORG_PN = "libX11" -- cgit 1.2.3-korg