[oe-commits] [openembedded-core] 22/22: eudev: Fix for multilib builds

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit ae4421d3a88a93d6d54eca0ebba1d0c6126cb252
Author: Alejandro Hernandez <alejandro.hernandez at linux.intel.com>
AuthorDate: Mon Feb 29 18:58:55 2016 +0000

    eudev: Fix for multilib builds
    
    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
    
    Signed-off-by: Alejandro Hernandez <alejandro.hernandez at linux.intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-core/udev/eudev_3.1.5.bb | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/udev/eudev_3.1.5.bb b/meta/recipes-core/udev/eudev_3.1.5.bb
index 4afcfdb..cfacdb9 100644
--- a/meta/recipes-core/udev/eudev_3.1.5.bb
+++ b/meta/recipes-core/udev/eudev_3.1.5.bb
@@ -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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.