diff options
Diffstat (limited to 'classes/qmake5_base.bbclass')
| -rw-r--r-- | classes/qmake5_base.bbclass | 4 |
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" | |||
| 47 | # this one needs to be exported, because qmake reads it from shell env | 47 | # this one needs to be exported, because qmake reads it from shell env |
| 48 | export QT_CONF_PATH = "${WORKDIR}/qt.conf" | 48 | export QT_CONF_PATH = "${WORKDIR}/qt.conf" |
| 49 | 49 | ||
| 50 | inherit qmake5_paths | 50 | inherit qmake5_paths remove-libtool |
| 51 | 51 | ||
| 52 | do_generate_qt_config_file() { | 52 | do_generate_qt_config_file() { |
| 53 | cat > ${QT_CONF_PATH} <<EOF | 53 | cat > ${QT_CONF_PATH} <<EOF |
| @@ -168,7 +168,6 @@ qmake5_base_nativesdk_do_install() { | |||
| 168 | 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" |
| 169 | 169 | ||
| 170 | oe_runmake install INSTALL_ROOT=${D} | 170 | oe_runmake install INSTALL_ROOT=${D} |
| 171 | find "${D}" -ignore_readdir_race -name "*.la" -delete | ||
| 172 | } | 171 | } |
| 173 | 172 | ||
| 174 | qmake5_base_do_install() { | 173 | qmake5_base_do_install() { |
| @@ -176,7 +175,6 @@ qmake5_base_do_install() { | |||
| 176 | find . -name "Makefile*" | xargs -r sed -i "s,(INSTALL_ROOT)${STAGING_DIR_TARGET},(INSTALL_ROOT),g" | 175 | find . -name "Makefile*" | xargs -r sed -i "s,(INSTALL_ROOT)${STAGING_DIR_TARGET},(INSTALL_ROOT),g" |
| 177 | 176 | ||
| 178 | oe_runmake install INSTALL_ROOT=${D} | 177 | oe_runmake install INSTALL_ROOT=${D} |
| 179 | find "${D}" -ignore_readdir_race -name "*.la" -delete | ||
| 180 | 178 | ||
| 181 | # everything except HostData and HostBinaries is prefixed with sysroot value, | 179 | # everything except HostData and HostBinaries is prefixed with sysroot value, |
| 182 | # but we cannot remove sysroot override, because that's useful for pkg-config etc | 180 | # but we cannot remove sysroot override, because that's useful for pkg-config etc |
