mirror of
https://git.yoctoproject.org/poky
synced 2026-04-02 17:02:21 +02:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
e2cf270327
commit
de2d643640
@@ -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 \
|
||||
|
||||
@@ -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"# \
|
||||
|
||||
Reference in New Issue
Block a user