diff options
| -rw-r--r-- | recipes-qt/qt5/qttools_git.bb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 1f1d7090..b766680a 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
| @@ -12,8 +12,7 @@ LIC_FILES_CHKSUM = " \ | |||
| 12 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 12 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
| 13 | " | 13 | " |
| 14 | 14 | ||
| 15 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns chrpath-replacement-native" | 15 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns" |
| 16 | EXTRANATIVEPATH += "chrpath-native" | ||
| 17 | # Patches from https://github.com/meta-qt5/qttools/commits/b5.13 | 16 | # Patches from https://github.com/meta-qt5/qttools/commits/b5.13 |
| 18 | # 5.13.meta-qt5.1 | 17 | # 5.13.meta-qt5.1 |
| 19 | SRC_URI += " \ | 18 | SRC_URI += " \ |
| @@ -37,6 +36,7 @@ export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_BINDIR}/llvm-config" | |||
| 37 | 36 | ||
| 38 | EXTRA_QMAKEVARS_PRE += " \ | 37 | EXTRA_QMAKEVARS_PRE += " \ |
| 39 | ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ | 38 | ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ |
| 39 | CONFIG+=disable_external_rpath \ | ||
| 40 | " | 40 | " |
| 41 | EXTRA_QMAKEVARS_PRE_append_class-native = " CONFIG+=config_clang_done CONFIG-=config_clang" | 41 | EXTRA_QMAKEVARS_PRE_append_class-native = " CONFIG+=config_clang_done CONFIG-=config_clang" |
| 42 | EXTRA_QMAKEVARS_PRE_append_class-nativesdk = " CONFIG+=config_clang_done CONFIG-=config_clang" | 42 | EXTRA_QMAKEVARS_PRE_append_class-nativesdk = " CONFIG+=config_clang_done CONFIG-=config_clang" |
| @@ -53,6 +53,3 @@ do_install_ptest() { | |||
| 53 | t=${D}${PTEST_PATH} | 53 | t=${D}${PTEST_PATH} |
| 54 | cp ${B}/tests/auto/qtdiag/tst_tdiag $t | 54 | cp ${B}/tests/auto/qtdiag/tst_tdiag $t |
| 55 | } | 55 | } |
| 56 | do_install_append_toolchain-clang() { | ||
| 57 | chrpath --delete ${D}${bindir}/qdoc | ||
| 58 | } | ||
