diff options
| author | Khem Raj <raj.khem@gmail.com> | 2019-12-14 17:03:32 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2019-12-14 17:03:32 -0800 |
| commit | a02e01ca689e007db16795cde8e67d7031661425 (patch) | |
| tree | fc95ca6422d590581284d5b78ddda5c2397a74da | |
| parent | 0d88f4488f08dc92081274ec954c8795d6dfe68c (diff) | |
qttools: Use CONFIG+=disable_external_rpath
Avoids using tools to remove rpaths later on
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -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 = " \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ " -DEPENDS += "qtbase qtdeclarative qtxmlpatterns chrpath-replacement-native" -EXTRANATIVEPATH += "chrpath-native" +DEPENDS += "qtbase qtdeclarative qtxmlpatterns" # Patches from https://github.com/meta-qt5/qttools/commits/b5.13 # 5.13.meta-qt5.1 SRC_URI += " \ @@ -37,6 +36,7 @@ export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_BINDIR}/llvm-config" EXTRA_QMAKEVARS_PRE += " \ ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ + CONFIG+=disable_external_rpath \ " EXTRA_QMAKEVARS_PRE_append_class-native = " CONFIG+=config_clang_done CONFIG-=config_clang" EXTRA_QMAKEVARS_PRE_append_class-nativesdk = " CONFIG+=config_clang_done CONFIG-=config_clang" @@ -53,6 +53,3 @@ do_install_ptest() { t=${D}${PTEST_PATH} cp ${B}/tests/auto/qtdiag/tst_tdiag $t } -do_install_append_toolchain-clang() { - chrpath --delete ${D}${bindir}/qdoc -} |