t-head/meta-qt5
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-qt5 synced 2026-09-11 00:25:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

qttools: Use CONFIG+=disable_external_rpath

Browse Source 
Avoids using tools to remove rpaths later on

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2019-12-14 17:03:32 -08:00
parent 0d88f4488f
commit a02e01ca68
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
recipes-qt/qt5/qttools_git.bb
View File

@@ -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
}