Skip to contentSkip to conversation

xorg-driver-common: remove obsolete .la removal

PATCH New Ross Burton 1 participant 2 messages Nov 21, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 xorg-driver-common: remove obsolete .la removal

We globally inherit remove-libtool, so there's no need to explicitly remove the .la files in the xorg drivers.

---
 meta/recipes-graphics/xorg-driver/xorg-driver-common.inc | 6 ------
 1 file changed, 6 deletions(-)
meta/recipes-graphics/xorg-driver/xorg-driver-common.inc +0 -6
index c61cdd05b35..38848676f41 100644
@@ -20,12 +20,6 @@ inherit_defer ${XORGBUILDCLASS}
 # depends on virtual/xserver
 REQUIRED_DISTRO_FEATURES = "x11"
 
-# FIXME: We don't want to include the libtool archives (*.la) from modules
-# directory, as they serve no useful purpose. Upstream should fix Makefile.am
-do_install:append() {
-	find ${D}${libdir}/xorg/modules -regex ".*\.la$" | xargs rm -f --
-}
-
 # Function to add the relevant ABI dependency to drivers, which should be called
 # from a PACKAGEFUNC.
 def _add_xorg_abi_depends(d, name):
Signature · 1 line
2.34.1
#1 lore raw

PATCH 2/2 gdk-pixbuf: remove obsolete .la references

gdk-pixbuf uses Meson to build now, so it doesn't generate .la files.

---
 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.12.bb | 3 ---
 1 file changed, 3 deletions(-)
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.12.bb +0 -3
index e32903a4511..96487a284af 100644
@@ -64,7 +64,6 @@ FILES:${PN}-dev += " \
 	${bindir}/gdk-pixbuf-pixdata \
         ${bindir}/gdk-pixbuf-print-mime-types \
 	${includedir}/* \
-	${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders/*.la \
 "
 
 PACKAGES_DYNAMIC += "^gdk-pixbuf-loader-.*"
@@ -98,8 +97,6 @@ do_install_ptest() {
 }
 
 do_install:append:class-native() {
-	find ${D}${libdir} -name "libpixbufloader-*.la" -exec rm \{\} \;
-
 	create_wrapper ${D}/${bindir}/gdk-pixbuf-csource \
 		XDG_DATA_DIRS=${STAGING_DATADIR} \
 		GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache
Signature · 1 line
2.34.1