[oe-commits] org.oe.dev packages/qt4/qt_staging.inc: Remove the moc_location and uic_location completely from the .pc file

[freyther commit]

packages/qt4/qt_staging.inc: Remove the moc_location and uic_location completely from the .pc file
    For the staging area with sysroot there is no sane way to give the location
    of the command in a sane way. I'm not aware of any one using this to get the uic/moc
    binary, e.g. cmake is using qmake to query these pathes.

Author: freyther at openembedded.org
Branch: org.openembedded.dev
Revision: 72cc02ff964ecabcc54cbfbf9cbf5c4eea3de955
ViewMTN: http://monotone.openembedded.org/revision/info/72cc02ff964ecabcc54cbfbf9cbf5c4eea3de955
Files:
1
packages/qt4/qt_staging.inc
Diffs:

#
# mt diff -r0cae5baef2348bca98b9a2a4f99adde516bc58a3 -r72cc02ff964ecabcc54cbfbf9cbf5c4eea3de955
#
#
#
# patch "packages/qt4/qt_staging.inc"
#  from [18378f24f82591ca212595f5d66b0b7aef0077b6]
#    to [f74af3775f1a2c2fb8670eca49ab7c2a89d91a53]
#
============================================================
--- packages/qt4/qt_staging.inc	18378f24f82591ca212595f5d66b0b7aef0077b6
+++ packages/qt4/qt_staging.inc	f74af3775f1a2c2fb8670eca49ab7c2a89d91a53
@@ -2,8 +2,8 @@ do_stage_append() {
 do_stage_append() {
     cd ${STAGING_LIBDIR}/pkgconfig
     sed -i s#"-L${S}/lib"##g Qt*.pc
-    sed -i s#"moc_location=${STAGING_BINDIR}/moc4"#moc_location=${layout_bindir}/moc4# Qt*.pc
-    sed -i s#"uic_location=${STAGING_BINDIR}/uic4"#uic_location=${layout_bindir}/uic4# Qt*.pc
+    sed -i s#"moc_location=${STAGING_BINDIR}/moc4$"## Qt*.pc
+    sed -i s#"uic_location=${STAGING_BINDIR}/uic4$"## Qt*.pc
     sed -i s#"-L${STAGING_LIBDIR}"##g Qt*.pc
     sed -i s#'$(OE_QMAKE_LIBS_X11)'#"${OE_QMAKE_LIBS_X11}"#g Qt*.pc