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 /recipes-qt | |
| 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 'recipes-qt')
| -rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtbase-native_git.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 4ac80be4..ccb09223 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
| @@ -204,7 +204,7 @@ do_configure() { | |||
| 204 | 204 | ||
| 205 | do_install() { | 205 | do_install() { |
| 206 | # Fix install paths for all | 206 | # Fix install paths for all |
| 207 | find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGING_DIR_NATIVE}${STAGING_DIR_NATIVE},(INSTALL_ROOT)${STAGING_DIR_NATIVE},g" | 207 | find . -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGING_DIR_NATIVE}${STAGING_DIR_NATIVE},(INSTALL_ROOT)${STAGING_DIR_NATIVE},g" |
| 208 | 208 | ||
| 209 | oe_runmake install INSTALL_ROOT=${D} | 209 | oe_runmake install INSTALL_ROOT=${D} |
| 210 | 210 | ||
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 14e85165..0683708b 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
| @@ -96,7 +96,7 @@ do_configure_prepend() { | |||
| 96 | 96 | ||
| 97 | do_install() { | 97 | do_install() { |
| 98 | # Fix install paths for all | 98 | # Fix install paths for all |
| 99 | find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGING_DIR_NATIVE}${STAGING_DIR_NATIVE},(INSTALL_ROOT)${STAGING_DIR_NATIVE},g" | 99 | find . -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGING_DIR_NATIVE}${STAGING_DIR_NATIVE},(INSTALL_ROOT)${STAGING_DIR_NATIVE},g" |
| 100 | 100 | ||
| 101 | oe_runmake install INSTALL_ROOT=${D} | 101 | oe_runmake install INSTALL_ROOT=${D} |
| 102 | 102 | ||
