* [PATCH] qt4: fix sed to have correct *.pc files
@ 2011-11-29 10:47 Eric Bénard
2011-11-29 10:52 ` Otavio Salvador
2011-11-29 13:48 ` Richard Purdie
0 siblings, 2 replies; 3+ messages in thread
From: Eric Bénard @ 2011-11-29 10:47 UTC (permalink / raw)
To: openembedded-core
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] qt4: fix sed to have correct *.pc files
2011-11-29 10:47 [PATCH] qt4: fix sed to have correct *.pc files Eric Bénard
@ 2011-11-29 10:52 ` Otavio Salvador
2011-11-29 13:48 ` Richard Purdie
1 sibling, 0 replies; 3+ messages in thread
From: Otavio Salvador @ 2011-11-29 10:52 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 3790 bytes --]
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
>
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
[-- Attachment #2: Type: text/html, Size: 5097 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] qt4: fix sed to have correct *.pc files
2011-11-29 10:47 [PATCH] qt4: fix sed to have correct *.pc files Eric Bénard
2011-11-29 10:52 ` Otavio Salvador
@ 2011-11-29 13:48 ` Richard Purdie
1 sibling, 0 replies; 3+ messages in thread
From: Richard Purdie @ 2011-11-29 13:48 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-11-29 13:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-29 10:47 [PATCH] qt4: fix sed to have correct *.pc files Eric Bénard
2011-11-29 10:52 ` Otavio Salvador
2011-11-29 13:48 ` Richard Purdie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox