diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2016-02-16 17:36:37 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-04-20 10:50:50 +0200 |
commit | 2f31f2a21b2ef9c5d09806a26af946cb38e61228 (patch) | |
tree | c0e655d917eb6630b61e6e33c2bc95af717b2765 /classes | |
parent | 9dc60fe10fe812eb4d722d81351c74ec598cb114 (diff) | |
download | meta-qt5-2f31f2a21b2ef9c5d09806a26af946cb38e61228.tar.gz |
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.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 |