Skip to contentSkip to conversation

eudev: Fix for multilib builds

PATCH New Alejandro Hernandez 1 participant 1 message Feb 29, 2016 1 message not in the archive

lore
Share & tools
lore
#1 lore raw

PATCH 1/1 eudev: Fix for multilib builds

In reply to a message not in the archive

On multilib environments, either some of the conf files or the libraries get installed on the wrong directory, this patch changes configuration options and fixes the issue when suitable

---
 meta/recipes-core/udev/eudev_3.1.5.bb | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
meta/recipes-core/udev/eudev_3.1.5.bb +9 -2
index 4afcfdb..cfacdb9 100644
@@ -46,11 +46,11 @@ FILES_${PN} += "${libexecdir} ${nonarch_base_libdir}/udev ${bindir}/udevadm"
 FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc \
                    ${includedir}/libudev.h ${libdir}/libudev.so \
                    ${includedir}/udev.h ${libdir}/libudev.la \
-                   ${libdir}/libudev.a ${libdir}/pkgconfig/libudev.pc \
+                   ${libdir}/pkgconfig/libudev.pc \
 		   "
 FILES_udev-cache = "${sysconfdir}/init.d/udev-cache ${sysconfdir}/default/udev-cache"
 
-EXTRA_OECONF = "--with-rootlibdir=${base_libdir} \
+EXTRA_OECONF = "--with-rootlibdir=${nonarch_base_libdir} \
 	     --sbindir=${base_sbindir} \
 	     --libexecdir=${nonarch_base_libdir} \
 	     --with-rootprefix= \
@@ -74,6 +74,13 @@ do_install_append(){
         # hid2hci has moved to bluez4. removed in udev as of version 169
         rm -f ${D}${base_libdir}/udev/hid2hci
 
+	# Fix for multilib systems where libs along with confs are installed on ${nonarch_base_libdir}
+	if ! [ -d ${D}${base_libdir} ]
+          then
+            install -d ${D}${base_libdir}
+	    mv ${D}${nonarch_base_libdir}/libudev.so* ${D}${base_libdir}/
+        fi
+
         echo 'udev_run="/var/run/udev"' >> ${D}${sysconfdir}/udev/udev.conf
 
         # Use classic network interface naming scheme
Signature · 1 line
2.6.2