Patchwork qt4: fix sed to have correct *.pc files

login
register
mail settings
Submitter Eric BENARD
Date Nov. 29, 2011, 10:47 a.m.
Message ID <1322563625-22780-1-git-send-email-eric@eukrea.com>
Download mbox | patch
Permalink /patch/15583/
State New
Headers show

Comments

Eric BENARD - Nov. 29, 2011, 10:47 a.m.
it seems sed doesn't handle \? properly if the string in not between
quotes.

without this patch, we get something like (for example for QtDBusE.pc :
Libs: -L${libdir} -lQtDBusE
Libs.private: -L/home/ebenard/WORK/setup-scripts/build/tmp-angstrom_2010_x-eglibc/sysroots/board/
usr/lib -L/usr/lib  -L/home/ebenard/WORK/setup-scripts/build/tmp-angstrom_2010_x-eglibc/sysroots/board
/usr/lib -lQtXmlE -L/usr/lib -lQtCoreE -lpthread
Cflags: -DQT_SHARED -I/usr/include/qtopia -I${includedir}

with the patch we get what is expected :
Libs: -L${libdir} -lQtDBusE
Libs.private:     -lQtXmlE  -lQtCoreE -lpthread
Cflags: -DQT_SHARED -I/usr/include/qtopia -I${includedir}

Signed-off-by: Eric Bénard <eric@eukrea.com>
---
 meta/recipes-qt/qt4/qt4-embedded.inc |    2 +-
 meta/recipes-qt/qt4/qt4-x11-free.inc |    2 +-
 meta/recipes-qt/qt4/qt4.inc          |   10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)
Otavio Salvador - Nov. 29, 2011, 10:52 a.m.
Acked-by: Otavio Salvador <otavio@ossystems.com.br>

On Tue, Nov 29, 2011 at 08:47, Eric Bénard <eric@eukrea.com> wrote:

> it seems sed doesn't handle \? properly if the string in not between
> quotes.
>
> without this patch, we get something like (for example for QtDBusE.pc :
> Libs: -L${libdir} -lQtDBusE
> Libs.private:
> -L/home/ebenard/WORK/setup-scripts/build/tmp-angstrom_2010_x-eglibc/sysroots/board/
> usr/lib -L/usr/lib
>  -L/home/ebenard/WORK/setup-scripts/build/tmp-angstrom_2010_x-eglibc/sysroots/board
> /usr/lib -lQtXmlE -L/usr/lib -lQtCoreE -lpthread
> Cflags: -DQT_SHARED -I/usr/include/qtopia -I${includedir}
>
> with the patch we get what is expected :
> Libs: -L${libdir} -lQtDBusE
> Libs.private:     -lQtXmlE  -lQtCoreE -lpthread
> Cflags: -DQT_SHARED -I/usr/include/qtopia -I${includedir}
>
> Signed-off-by: Eric Bénard <eric@eukrea.com>
> ---
>  meta/recipes-qt/qt4/qt4-embedded.inc |    2 +-
>  meta/recipes-qt/qt4/qt4-x11-free.inc |    2 +-
>  meta/recipes-qt/qt4/qt4.inc          |   10 +++++-----
>  3 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc
> b/meta/recipes-qt/qt4/qt4-embedded.inc
> index bee7345..c4f6e98 100644
> --- a/meta/recipes-qt/qt4/qt4-embedded.inc
> +++ b/meta/recipes-qt/qt4/qt4-embedded.inc
> @@ -3,7 +3,7 @@ SECTION = "libs"
>  LICENSE = "LGPLv2.1 | GPLv3"
>  HOMEPAGE = "http://qt.nokia.com"
>  DEPENDS += "directfb tslib"
> -INC_PR = "r36"
> +INC_PR = "r37"
>
>  QT_BASE_NAME ?= "qt4-embedded"
>  QT_BASE_LIB  ?= "libqt-embedded"
> diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc
> b/meta/recipes-qt/qt4/qt4-x11-free.inc
> index f391028..5abb5a1 100644
> --- a/meta/recipes-qt/qt4/qt4-x11-free.inc
> +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
> @@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com"
>  SECTION = "x11/libs"
>  DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext
> libxrender libxrandr libxcursor"
>
> -INC_PR = "r32"
> +INC_PR = "r33"
>
>  QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl',
> '-no-opengl', d)} "
>  QT_GLFLAGS_qemux86 = "-opengl"
> diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
> index 82ba637..b365e75 100644
> --- a/meta/recipes-qt/qt4/qt4.inc
> +++ b/meta/recipes-qt/qt4/qt4.inc
> @@ -294,13 +294,13 @@ do_install() {
>        rm -f ${D}/${bindir}/lrelease
>
>        # fix pkgconfig, libtool and prl files
> -       sed -i -e s#-L${S}/lib/\?##g \
> -                       -e s#-L${STAGING_LIBDIR}/\?##g \
> +       sed -i -e 's#-L${S}/lib/\?##g' \
> +                       -e 's#-L${STAGING_LIBDIR}/\?##g' \
>                        -e 's#STAGING_LIBDIR}#libdir}'#g \
> -                       -e s#-L${libdir}/\?##g \
> +                       -e 's#-L${libdir}/\?##g' \
>                        -e
> s#'$(OE_QMAKE_LIBS_X11)'#"${OE_QMAKE_LIBS_X11}"#g \
> -                       -e s#" -Wl,-rpath-link,${S}/lib/\?"##g \
> -                       -e s#" -Wl,-rpath-link,${libdir}/\?"##g \
> +                       -e 's#" -Wl,-rpath-link,${S}/lib/\?"##g' \
> +                       -e 's#" -Wl,-rpath-link,${libdir}/\?"##g' \
>                        -e 's#Iin#I${in#g' \
>                        ${D}${libdir}/*.la ${D}${libdir}/*.prl
> ${D}${libdir}/pkgconfig/*.pc
>
> --
> 1.7.6.4
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
Richard Purdie - Nov. 29, 2011, 1:48 p.m.
On Tue, 2011-11-29 at 11:47 +0100, Eric Bénard wrote:
> it seems sed doesn't handle \? properly if the string in not between
> quotes.
> 
> without this patch, we get something like (for example for QtDBusE.pc :
> Libs: -L${libdir} -lQtDBusE
> Libs.private: -L/home/ebenard/WORK/setup-scripts/build/tmp-angstrom_2010_x-eglibc/sysroots/board/
> usr/lib -L/usr/lib  -L/home/ebenard/WORK/setup-scripts/build/tmp-angstrom_2010_x-eglibc/sysroots/board
> /usr/lib -lQtXmlE -L/usr/lib -lQtCoreE -lpthread
> Cflags: -DQT_SHARED -I/usr/include/qtopia -I${includedir}
> 
> with the patch we get what is expected :
> Libs: -L${libdir} -lQtDBusE
> Libs.private:     -lQtXmlE  -lQtCoreE -lpthread
> Cflags: -DQT_SHARED -I/usr/include/qtopia -I${includedir}
> 
> Signed-off-by: Eric Bénard <eric@eukrea.com>
> ---
>  meta/recipes-qt/qt4/qt4-embedded.inc |    2 +-
>  meta/recipes-qt/qt4/qt4-x11-free.inc |    2 +-
>  meta/recipes-qt/qt4/qt4.inc          |   10 +++++-----
>  3 files changed, 7 insertions(+), 7 deletions(-)

Merged to master, thanks.

Richard

Patch

diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
index bee7345..c4f6e98 100644
--- a/meta/recipes-qt/qt4/qt4-embedded.inc
+++ b/meta/recipes-qt/qt4/qt4-embedded.inc
@@ -3,7 +3,7 @@  SECTION = "libs"
 LICENSE = "LGPLv2.1 | GPLv3"
 HOMEPAGE = "http://qt.nokia.com"
 DEPENDS += "directfb tslib"
-INC_PR = "r36"
+INC_PR = "r37"
 
 QT_BASE_NAME ?= "qt4-embedded"
 QT_BASE_LIB  ?= "libqt-embedded"
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index f391028..5abb5a1 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -5,7 +5,7 @@  HOMEPAGE = "http://qt.nokia.com"
 SECTION = "x11/libs"
 DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
 
-INC_PR = "r32"
+INC_PR = "r33"
 
 QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
 QT_GLFLAGS_qemux86 = "-opengl"
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 82ba637..b365e75 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -294,13 +294,13 @@  do_install() {
 	rm -f ${D}/${bindir}/lrelease
 
 	# fix pkgconfig, libtool and prl files
-	sed -i -e s#-L${S}/lib/\?##g \
-			-e s#-L${STAGING_LIBDIR}/\?##g \
+	sed -i -e 's#-L${S}/lib/\?##g' \
+			-e 's#-L${STAGING_LIBDIR}/\?##g' \
 			-e 's#STAGING_LIBDIR}#libdir}'#g \
-			-e s#-L${libdir}/\?##g \
+			-e 's#-L${libdir}/\?##g' \
 			-e s#'$(OE_QMAKE_LIBS_X11)'#"${OE_QMAKE_LIBS_X11}"#g \
-			-e s#" -Wl,-rpath-link,${S}/lib/\?"##g \
-			-e s#" -Wl,-rpath-link,${libdir}/\?"##g \
+			-e 's#" -Wl,-rpath-link,${S}/lib/\?"##g' \
+			-e 's#" -Wl,-rpath-link,${libdir}/\?"##g' \
 			-e 's#Iin#I${in#g' \
 			${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc