diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2015-07-10 00:14:58 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-12 22:55:45 +0100 |
commit | de2d6436404e1ea6afc152befcc873619960c0d4 (patch) | |
tree | 2a6758f42a71b29225b7141655855c2f52b3f0c1 /meta/recipes-qt/qt4/qt4.inc | |
parent | e2cf27032731fa2057326d81a9319e45b447858d (diff) | |
download | poky-de2d6436404e1ea6afc152befcc873619960c0d4.tar.gz |
qt4: fixes for sed command
* There is no $$QT_BUILD_TREE/bin/lrelease in any .pro file, so remove
the sed command.
* Only translations/translations.pro has "qtPrepareTool(LRELEASE", so
use the file name directly rather than find all the .pro files.
* The SEDME in linux.conf had been gone in 2010, and no
'-Wl,-rpath-link' in linux.conf either, so remove the sed commands.
(From OE-Core rev: e519ce3675a90ce6583ced9ddb84260ff08bc74b)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4.inc')
-rw-r--r-- | meta/recipes-qt/qt4/qt4.inc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index f1c792b572..2058e54d3d 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc | |||
@@ -350,9 +350,6 @@ do_install() { | |||
350 | -e 's#-ljscore##g' \ | 350 | -e 's#-ljscore##g' \ |
351 | ${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc | 351 | ${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc |
352 | 352 | ||
353 | sed -i -e s#" -Wl,-rpath-link,${S}/lib"##g \ | ||
354 | ${D}${datadir}/${QT_DIR_NAME}/mkspecs/common/linux.conf | ||
355 | |||
356 | # fix pkgconfig files | 353 | # fix pkgconfig files |
357 | sed -i -e s#"moc_location=.*$"#"moc_location=${bindir}/moc4"# \ | 354 | sed -i -e s#"moc_location=.*$"#"moc_location=${bindir}/moc4"# \ |
358 | -e s#"uic_location=.*$"#"uic_location=${bindir}/uic4"# \ | 355 | -e s#"uic_location=.*$"#"uic_location=${bindir}/uic4"# \ |