Acked-by: Otavio Salvador &lt;<a href="mailto:otavio@ossystems.com.br">otavio@ossystems.com.br</a>&gt;<br><br><div class="gmail_quote">On Tue, Nov 29, 2011 at 08:47, Eric Bénard <span dir="ltr">&lt;<a href="mailto:eric@eukrea.com">eric@eukrea.com</a>&gt;</span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">it seems sed doesn&#39;t handle \? properly if the string in not between<br>
quotes.<br>
<br>
without this patch, we get something like (for example for QtDBusE.pc :<br>
Libs: -L${libdir} -lQtDBusE<br>
Libs.private: -L/home/ebenard/WORK/setup-scripts/build/tmp-angstrom_2010_x-eglibc/sysroots/board/<br>
usr/lib -L/usr/lib  -L/home/ebenard/WORK/setup-scripts/build/tmp-angstrom_2010_x-eglibc/sysroots/board<br>
/usr/lib -lQtXmlE -L/usr/lib -lQtCoreE -lpthread<br>
Cflags: -DQT_SHARED -I/usr/include/qtopia -I${includedir}<br>
<br>
with the patch we get what is expected :<br>
Libs: -L${libdir} -lQtDBusE<br>
Libs.private:     -lQtXmlE  -lQtCoreE -lpthread<br>
Cflags: -DQT_SHARED -I/usr/include/qtopia -I${includedir}<br>
<br>
Signed-off-by: Eric Bénard &lt;<a href="mailto:eric@eukrea.com">eric@eukrea.com</a>&gt;<br>
---<br>
 meta/recipes-qt/qt4/qt4-embedded.inc |    2 +-<br>
 meta/recipes-qt/qt4/qt4-x11-free.inc |    2 +-<br>
 meta/recipes-qt/qt4/qt4.inc          |   10 +++++-----<br>
 3 files changed, 7 insertions(+), 7 deletions(-)<br>
<br>
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc<br>
index bee7345..c4f6e98 100644<br>
--- a/meta/recipes-qt/qt4/qt4-embedded.inc<br>
+++ b/meta/recipes-qt/qt4/qt4-embedded.inc<br>
@@ -3,7 +3,7 @@ SECTION = &quot;libs&quot;<br>
 LICENSE = &quot;LGPLv2.1 | GPLv3&quot;<br>
 HOMEPAGE = &quot;<a href="http://qt.nokia.com" target="_blank">http://qt.nokia.com</a>&quot;<br>
 DEPENDS += &quot;directfb tslib&quot;<br>
-INC_PR = &quot;r36&quot;<br>
+INC_PR = &quot;r37&quot;<br>
<br>
 QT_BASE_NAME ?= &quot;qt4-embedded&quot;<br>
 QT_BASE_LIB  ?= &quot;libqt-embedded&quot;<br>
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc<br>
index f391028..5abb5a1 100644<br>
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc<br>
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc<br>
@@ -5,7 +5,7 @@ HOMEPAGE = &quot;<a href="http://qt.nokia.com" target="_blank">http://qt.nokia.com</a>&quot;<br>
 SECTION = &quot;x11/libs&quot;<br>
 DEPENDS += &quot;virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor&quot;<br>
<br>
-INC_PR = &quot;r32&quot;<br>
+INC_PR = &quot;r33&quot;<br>
<br>
 QT_GLFLAGS ?= &quot;${@base_contains(&#39;DISTRO_FEATURES&#39;, &#39;opengl&#39;, &#39;-opengl&#39;, &#39;-no-opengl&#39;, d)} &quot;<br>
 QT_GLFLAGS_qemux86 = &quot;-opengl&quot;<br>
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc<br>
index 82ba637..b365e75 100644<br>
--- a/meta/recipes-qt/qt4/qt4.inc<br>
+++ b/meta/recipes-qt/qt4/qt4.inc<br>
@@ -294,13 +294,13 @@ do_install() {<br>
        rm -f ${D}/${bindir}/lrelease<br>
<br>
        # fix pkgconfig, libtool and prl files<br>
-       sed -i -e s#-L${S}/lib/\?##g \<br>
-                       -e s#-L${STAGING_LIBDIR}/\?##g \<br>
+       sed -i -e &#39;s#-L${S}/lib/\?##g&#39; \<br>
+                       -e &#39;s#-L${STAGING_LIBDIR}/\?##g&#39; \<br>
                        -e &#39;s#STAGING_LIBDIR}#libdir}&#39;#g \<br>
-                       -e s#-L${libdir}/\?##g \<br>
+                       -e &#39;s#-L${libdir}/\?##g&#39; \<br>
                        -e s#&#39;$(OE_QMAKE_LIBS_X11)&#39;#&quot;${OE_QMAKE_LIBS_X11}&quot;#g \<br>
-                       -e s#&quot; -Wl,-rpath-link,${S}/lib/\?&quot;##g \<br>
-                       -e s#&quot; -Wl,-rpath-link,${libdir}/\?&quot;##g \<br>
+                       -e &#39;s#&quot; -Wl,-rpath-link,${S}/lib/\?&quot;##g&#39; \<br>
+                       -e &#39;s#&quot; -Wl,-rpath-link,${libdir}/\?&quot;##g&#39; \<br>
                        -e &#39;s#Iin#I${in#g&#39; \<br>
                        ${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc<br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
1.7.6.4<br>
<br>
<br>
_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.openembedded.org</a><br>
<a href="http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core" target="_blank">http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core</a><br>
</font></span></blockquote></div><br><br clear="all"><div><br></div>-- <br>Otavio Salvador                             O.S. Systems<br>E-mail: <a href="mailto:otavio@ossystems.com.br" target="_blank">otavio@ossystems.com.br</a>  <a href="http://www.ossystems.com.br" target="_blank">http://www.ossystems.com.br</a><br>
Mobile: +55 53 9981-7854              <a href="http://projetos.ossystems.com.br" target="_blank">http://projetos.ossystems.com.br</a><br><br>