summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-07-10 00:14:58 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-12 22:53:21 +0100
commite519ce3675a90ce6583ced9ddb84260ff08bc74b (patch)
tree6160883ae8e3da3d7e87cb2b377671c75464a5a3
parent76c9c26530f704908d4afda8ec757e75db6afc48 (diff)
downloadopenembedded-core-contrib-e519ce3675a90ce6583ced9ddb84260ff08bc74b.tar.gz
openembedded-core-contrib-e519ce3675a90ce6583ced9ddb84260ff08bc74b.tar.bz2
openembedded-core-contrib-e519ce3675a90ce6583ced9ddb84260ff08bc74b.zip
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. Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.7.inc8
-rw-r--r--meta/recipes-qt/qt4/qt4.inc3
2 files changed, 2 insertions, 9 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7.inc b/meta/recipes-qt/qt4/qt4-4.8.7.inc
index 67fad3ab94..5257e760e0 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.7.inc
+++ b/meta/recipes-qt/qt4/qt4-4.8.7.inc
@@ -52,13 +52,9 @@ FILES_${QT_BASE_NAME}-tests-dbg = "${prefix}/tests/qt4/*/.debug"
FILES_${QT_BASE_NAME}-tests = "${prefix}/tests/qt4/*"
do_configure_prepend() {
- for pro in $(find ${S} -name "*.pro") ; do
- sed -i \
- -e 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' \
- -e 's:qtPrepareTool(LRELEASE, lrelease):LRELEASE = ${OE_QMAKE_LRELEASE}:g' $pro
- done
+ sed -i 's:qtPrepareTool(LRELEASE, lrelease):LRELEASE = ${OE_QMAKE_LRELEASE}:g' \
+ ${S}/translations/translations.pro
- sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf
sed -i \
-e /QMAKE_MOC\ /d \
-e /QMAKE_UIC\ /d \
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() {
-e 's#-ljscore##g' \
${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc
- sed -i -e s#" -Wl,-rpath-link,${S}/lib"##g \
- ${D}${datadir}/${QT_DIR_NAME}/mkspecs/common/linux.conf
-
# fix pkgconfig files
sed -i -e s#"moc_location=.*$"#"moc_location=${bindir}/moc4"# \
-e s#"uic_location=.*$"#"uic_location=${bindir}/uic4"# \