summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHolger Freyther <zecke@selfish.org>2008-03-10 04:36:22 +0000
committerHolger Freyther <zecke@selfish.org>2008-03-10 04:36:22 +0000
commit8a22fc8e84e37ac2990e1bbbd751740bde04dacd (patch)
tree7c958f04ad3bd3049b3953d91607a7d6a292e326
parentb5b71c557ff0dbc50ff57e73c556aec4ceff046d (diff)
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.
-rw-r--r--packages/qt4/qt_staging.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/qt4/qt_staging.inc b/packages/qt4/qt_staging.inc
index f8f10de33c..1c3d69c1af 100644
--- a/packages/qt4/qt_staging.inc
+++ b/packages/qt4/qt_staging.inc
@@ -2,8 +2,8 @@
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