From e91dea65659b0975146ad4f23d46e561ba8d9a08 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 14 Feb 2016 11:54:14 +0100 Subject: qmake5_base: delete *.la files * they reference workdir and trip sanity check: ERROR: QA Issue: libQt5Sql.la failed sanity test (workdir) in path qtbase/5.5.99+5.6.0-alpha1+gitAUTOINC+f7f4dde80e-r0/sysroot-destdir//usr/lib [la] * I'm intentionally not using remove-libtool.bbclass recently added to oe-core, because many people combine newer meta-qt5 with older oe-core and can be missing this bbclass, I've pending patch to migrate this to remove-libtool.bbclass, will probably merge it after 2.1 or 2.2 release. Signed-off-by: Martin Jansa --- classes/qmake5_base.bbclass | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'classes') diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index a766cc6b..5b2633bc 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -160,20 +160,23 @@ qmake5_base_do_configure () { qmake5_base_native_do_install() { oe_runmake install INSTALL_ROOT=${D} + find "${D}" -ignore_readdir_race -name "*.la" -delete } qmake5_base_nativesdk_do_install() { # Fix install paths for all - find -name "Makefile*" | xargs -r sed -i "s,(INSTALL_ROOT)${STAGING_DIR_HOST},(INSTALL_ROOT),g" + find . -name "Makefile*" | xargs -r sed -i "s,(INSTALL_ROOT)${STAGING_DIR_HOST},(INSTALL_ROOT),g" oe_runmake install INSTALL_ROOT=${D} + find "${D}" -ignore_readdir_race -name "*.la" -delete } qmake5_base_do_install() { # Fix install paths for all - find -name "Makefile*" | xargs -r sed -i "s,(INSTALL_ROOT)${STAGING_DIR_TARGET},(INSTALL_ROOT),g" + find . -name "Makefile*" | xargs -r sed -i "s,(INSTALL_ROOT)${STAGING_DIR_TARGET},(INSTALL_ROOT),g" oe_runmake install INSTALL_ROOT=${D} + find "${D}" -ignore_readdir_race -name "*.la" -delete # everything except HostData and HostBinaries is prefixed with sysroot value, # but we cannot remove sysroot override, because that's useful for pkg-config etc -- cgit v1.2.3