aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-08-26 00:28:51 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2018-09-19 09:55:34 +0000
commitc977d68f3a27500f7f9227b4558dadd216384b5c (patch)
treef7531a2fea836a13a49f3c4bb8febe8eb13cf67e
parent189dd8ab10cace73f46fab8e22bf930b1f6aa5d8 (diff)
qt5-creator: Strip out redundant RPATH
Fixes ERROR: QA Issue: qt5-creator: /work/mips32r2-bec-linux-musl/qt5-creator/4.5.1-r0/packages-split/qt5-creator/usr/libexec/qtcreator/qbs_processlauncher contains probably-redundant RPATH /usr/lib qt5-creator: /work/mips32r2-bec-linux-musl/qt5-creator/4.5.1-r0/packages-split/qt5-creator/usr/libexec/qtcreator/qtcreator_process_stub contains probably-redundant RPATH /usr/lib qt5-creator: /work/mips32r2-bec-linux-musl/qt5-creator/4.5.1-r0/packages-split/qt5-creator/usr/lib/qt5/qtcreator/libqbscore.so.1.10.1 contains probably-redundant RPATH /usr/lib [useless-rpaths] Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--recipes-qt/qt5/qt5-creator_4.5.1.bb7
1 files changed, 6 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qt5-creator_4.5.1.bb b/recipes-qt/qt5/qt5-creator_4.5.1.bb
index 6eaf785f..4c26ac49 100644
--- a/recipes-qt/qt5/qt5-creator_4.5.1.bb
+++ b/recipes-qt/qt5/qt5-creator_4.5.1.bb
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \
inherit qmake5
-DEPENDS = "qtbase qtscript qtwebkit qtxmlpatterns qtx11extras qtdeclarative qttools qttools-native qtsvg"
+DEPENDS = "qtbase qtscript qtwebkit qtxmlpatterns qtx11extras qtdeclarative qttools qttools-native qtsvg chrpath-replacement-native"
DEPENDS_append_libc-musl = " libexecinfo"
# Patches from https://github.com/meta-qt5/qtcreator/commits/b5.4.1
@@ -34,6 +34,8 @@ S = "${WORKDIR}/qt-creator-opensource-src-${PV}"
EXTRA_QMAKEVARS_PRE += "IDE_LIBRARY_BASENAME=${baselib}${QT_DIR_NAME}"
+EXTRANATIVEPATH += "chrpath-native"
+
do_configure_append() {
# Find native tools
sed -i 's:${STAGING_BINDIR}.*/qdoc:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdoc:g' ${B}/Makefile
@@ -46,6 +48,9 @@ do_install() {
install -d ${D}${datadir}/applications
install -m 0644 ${WORKDIR}/qtcreator.desktop.in ${D}${datadir}/applications/qtcreator.desktop
sed -i 's:@QT5_QMAKE@:${OE_QMAKE_PATH_QT_BINS}:g' ${D}${datadir}/applications/qtcreator.desktop
+ chrpath --delete ${D}${libexecdir}/qtcreator/qtcreator_process_stub
+ chrpath --delete ${D}${libexecdir}/qtcreator/qbs_processlauncher
+ chrpath --delete ${D}${libdir}/qt5/qtcreator/libqbscore.so.*
}
FILES_${PN} += " \