aboutsummaryrefslogtreecommitdiffstats
path: root/classes
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2016-02-16 17:36:37 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2016-03-02 11:18:50 +0100
commit3eae3fe238e55097bd46ac32516ab845c547a738 (patch)
tree45838bb396e0fc2abf1671c4a3e6cd7e2a996aef /classes
parentbc54e237e5c8b31f056bf74c25404e4fb3155946 (diff)
qmake5_base: use remove-libtool bbclass
* this requires latest oe-core (Yocto 2.1), if you want to use latest meta-qt5 with older oe-core, you need to backport this bbclass and more importantly don't forget to provide EXTRA_CONF_PACKAGECONFIG Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'classes')
-rw-r--r--classes/qmake5_base.bbclass4
1 files changed, 1 insertions, 3 deletions
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
index 5b2633bc..c2a84985 100644
--- a/classes/qmake5_base.bbclass
+++ b/classes/qmake5_base.bbclass
@@ -47,7 +47,7 @@ OE_QMAKE_WAYLAND_SCANNER = "${STAGING_BINDIR_NATIVE}/wayland-scanner"
# this one needs to be exported, because qmake reads it from shell env
export QT_CONF_PATH = "${WORKDIR}/qt.conf"
-inherit qmake5_paths
+inherit qmake5_paths remove-libtool
do_generate_qt_config_file() {
cat > ${QT_CONF_PATH} <<EOF
@@ -168,7 +168,6 @@ qmake5_base_nativesdk_do_install() {
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() {
@@ -176,7 +175,6 @@ qmake5_base_do_install() {
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