diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2016-02-14 11:54:14 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-02-17 22:55:37 +0100 |
commit | e91dea65659b0975146ad4f23d46e561ba8d9a08 (patch) | |
tree | c00283980011403f301ab1ebd15dce84afdd110c /classes | |
parent | 7ac1481d0a5b702af5ebedd1ac035bd5b67d666f (diff) | |
download | meta-qt5-e91dea65659b0975146ad4f23d46e561ba8d9a08.tar.gz |
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 <Martin.Jansa@gmail.com>
Diffstat (limited to 'classes')
-rw-r--r-- | classes/qmake5_base.bbclass | 7 |
1 files changed, 5 insertions, 2 deletions
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 () { | |||
160 | 160 | ||
161 | qmake5_base_native_do_install() { | 161 | qmake5_base_native_do_install() { |
162 | oe_runmake install INSTALL_ROOT=${D} | 162 | oe_runmake install INSTALL_ROOT=${D} |
163 | find "${D}" -ignore_readdir_race -name "*.la" -delete | ||
163 | } | 164 | } |
164 | 165 | ||
165 | qmake5_base_nativesdk_do_install() { | 166 | qmake5_base_nativesdk_do_install() { |
166 | # Fix install paths for all | 167 | # Fix install paths for all |
167 | find -name "Makefile*" | xargs -r sed -i "s,(INSTALL_ROOT)${STAGING_DIR_HOST},(INSTALL_ROOT),g" | 168 | find . -name "Makefile*" | xargs -r sed -i "s,(INSTALL_ROOT)${STAGING_DIR_HOST},(INSTALL_ROOT),g" |
168 | 169 | ||
169 | oe_runmake install INSTALL_ROOT=${D} | 170 | oe_runmake install INSTALL_ROOT=${D} |
171 | find "${D}" -ignore_readdir_race -name "*.la" -delete | ||
170 | } | 172 | } |
171 | 173 | ||
172 | qmake5_base_do_install() { | 174 | qmake5_base_do_install() { |
173 | # Fix install paths for all | 175 | # Fix install paths for all |
174 | find -name "Makefile*" | xargs -r sed -i "s,(INSTALL_ROOT)${STAGING_DIR_TARGET},(INSTALL_ROOT),g" | 176 | find . -name "Makefile*" | xargs -r sed -i "s,(INSTALL_ROOT)${STAGING_DIR_TARGET},(INSTALL_ROOT),g" |
175 | 177 | ||
176 | oe_runmake install INSTALL_ROOT=${D} | 178 | oe_runmake install INSTALL_ROOT=${D} |
179 | find "${D}" -ignore_readdir_race -name "*.la" -delete | ||
177 | 180 | ||
178 | # everything except HostData and HostBinaries is prefixed with sysroot value, | 181 | # everything except HostData and HostBinaries is prefixed with sysroot value, |
179 | # but we cannot remove sysroot override, because that's useful for pkg-config etc | 182 | # but we cannot remove sysroot override, because that's useful for pkg-config etc |