* [PATCH 1/2] meta: qt4: fix postprocessing of pkg-config files
@ 2011-09-25 12:57 Simon Busch
2011-09-25 12:57 ` [PATCH 2/2] qt4-embedded: move qte.sh profile script into own package Simon Busch
2011-09-28 16:06 ` [PATCH 1/2] meta: qt4: fix postprocessing of pkg-config files Saul Wold
0 siblings, 2 replies; 4+ messages in thread
From: Simon Busch @ 2011-09-25 12:57 UTC (permalink / raw)
To: openembedded-core
When building qt4-embedded the generated and cleaned pkg-config files for qt are wrong.
The Cflags variable contains something like ${includedir}/qtopia/QtCore where
${includedir} is already /usr/include/qtopia/QtCore.
This patch reverts the fix up of the Cflags variable implemented in do_install.
Signed-off-by: Simon Busch <morphis@gravedo.de>
---
meta/recipes-qt/qt4/qt4-embedded.inc | 2 +-
meta/recipes-qt/qt4/qt4-x11-free.inc | 2 +-
meta/recipes-qt/qt4/qt4.inc | 4 +---
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
index 9914c61..1ede922 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 = "r30"
+INC_PR = "r31"
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 0a714be..a360ec3 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 = "r27"
+INC_PR = "r28"
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 5545be7..7f3e1a4 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -293,7 +293,6 @@ do_install() {
-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#I/usr/include#Iincludedir}#g' \
-e 's#Iin#I${in#g' \
${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc
@@ -310,8 +309,7 @@ do_install() {
# QT abuses $includedir to point to its headers, which breaks pkgconfig sysroot, so manually fix it up here:
for pc in ${D}${libdir}/pkgconfig/*.pc ; do
- sed -i -e "s:prefix}include/${QT_BASE_NAME}/$(basename $pc .pc):prefix}/include:" \
- -e "s,Cflags: ,Cflags: -IP{includedir}/${QT_BASE_NAME}/$(basename $pc .pc) ," \
+ sed -i -e "s:prefix}include/${QT_DIR_NAME}/$(basename $pc .pc):prefix}/include:" \
-e 's:IP{:I${:g' $pc
done
--
1.7.4.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] qt4-embedded: move qte.sh profile script into own package
2011-09-25 12:57 [PATCH 1/2] meta: qt4: fix postprocessing of pkg-config files Simon Busch
@ 2011-09-25 12:57 ` Simon Busch
2011-09-28 16:06 ` Saul Wold
2011-09-28 16:06 ` [PATCH 1/2] meta: qt4: fix postprocessing of pkg-config files Saul Wold
1 sibling, 1 reply; 4+ messages in thread
From: Simon Busch @ 2011-09-25 12:57 UTC (permalink / raw)
To: openembedded-core
We don't want to pull the whole qt suite in our images when only installing a tiny setup
which needs the profile script for several configuration issues. This moves the qte.sh
profile script into a qt4-embedded-conf package which is automatically installed when an
image depends on qt4-embedded.
Signed-off-by: Simon Busch <morphis@gravedo.de>
---
meta/recipes-qt/qt4/qt4-embedded.inc | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
index 1ede922..ed872b0 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 = "r31"
+INC_PR = "r32"
QT_BASE_NAME ?= "qt4-embedded"
QT_BASE_LIB ?= "libqt-embedded"
@@ -27,7 +27,11 @@ do_install_append() {
install -m 0755 ${WORKDIR}/qte.sh ${D}${sysconfdir}/profile.d/
}
-FILES_${PN} += " ${sysconfdir}/profile.d/qte.sh"
+# We put the qte profile into it's own package as we don't want to install all qt stuff
+# with depending on the global package qt4-embedded
+PACKAGES += " ${PN}-conf"
+FILES_${PN}-conf += " ${sysconfdir}/profile.d/qte.sh"
+RDEPENDS_${PN} += " ${PN}-conf"
inherit qt4e
--
1.7.4.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] meta: qt4: fix postprocessing of pkg-config files
2011-09-25 12:57 [PATCH 1/2] meta: qt4: fix postprocessing of pkg-config files Simon Busch
2011-09-25 12:57 ` [PATCH 2/2] qt4-embedded: move qte.sh profile script into own package Simon Busch
@ 2011-09-28 16:06 ` Saul Wold
1 sibling, 0 replies; 4+ messages in thread
From: Saul Wold @ 2011-09-28 16:06 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 09/25/2011 05:57 AM, Simon Busch wrote:
> When building qt4-embedded the generated and cleaned pkg-config files for qt are wrong.
> The Cflags variable contains something like ${includedir}/qtopia/QtCore where
> ${includedir} is already /usr/include/qtopia/QtCore.
>
> This patch reverts the fix up of the Cflags variable implemented in do_install.
>
> Signed-off-by: Simon Busch<morphis@gravedo.de>
> ---
> meta/recipes-qt/qt4/qt4-embedded.inc | 2 +-
> meta/recipes-qt/qt4/qt4-x11-free.inc | 2 +-
> meta/recipes-qt/qt4/qt4.inc | 4 +---
> 3 files changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
> index 9914c61..1ede922 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 = "r30"
> +INC_PR = "r31"
>
> 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 0a714be..a360ec3 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 = "r27"
> +INC_PR = "r28"
>
> 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 5545be7..7f3e1a4 100644
> --- a/meta/recipes-qt/qt4/qt4.inc
> +++ b/meta/recipes-qt/qt4/qt4.inc
> @@ -293,7 +293,6 @@ do_install() {
> -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#I/usr/include#Iincludedir}#g' \
> -e 's#Iin#I${in#g' \
> ${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc
>
> @@ -310,8 +309,7 @@ do_install() {
>
> # QT abuses $includedir to point to its headers, which breaks pkgconfig sysroot, so manually fix it up here:
> for pc in ${D}${libdir}/pkgconfig/*.pc ; do
> - sed -i -e "s:prefix}include/${QT_BASE_NAME}/$(basename $pc .pc):prefix}/include:" \
> - -e "s,Cflags: ,Cflags: -IP{includedir}/${QT_BASE_NAME}/$(basename $pc .pc) ," \
> + sed -i -e "s:prefix}include/${QT_DIR_NAME}/$(basename $pc .pc):prefix}/include:" \
> -e 's:IP{:I${:g' $pc
> done
>
Merged into OE-Core
Thanks
Sau!
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] qt4-embedded: move qte.sh profile script into own package
2011-09-25 12:57 ` [PATCH 2/2] qt4-embedded: move qte.sh profile script into own package Simon Busch
@ 2011-09-28 16:06 ` Saul Wold
0 siblings, 0 replies; 4+ messages in thread
From: Saul Wold @ 2011-09-28 16:06 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 09/25/2011 05:57 AM, Simon Busch wrote:
> We don't want to pull the whole qt suite in our images when only installing a tiny setup
> which needs the profile script for several configuration issues. This moves the qte.sh
> profile script into a qt4-embedded-conf package which is automatically installed when an
> image depends on qt4-embedded.
>
> Signed-off-by: Simon Busch<morphis@gravedo.de>
> ---
> meta/recipes-qt/qt4/qt4-embedded.inc | 8 ++++++--
> 1 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
> index 1ede922..ed872b0 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 = "r31"
> +INC_PR = "r32"
>
> QT_BASE_NAME ?= "qt4-embedded"
> QT_BASE_LIB ?= "libqt-embedded"
> @@ -27,7 +27,11 @@ do_install_append() {
> install -m 0755 ${WORKDIR}/qte.sh ${D}${sysconfdir}/profile.d/
> }
>
> -FILES_${PN} += " ${sysconfdir}/profile.d/qte.sh"
> +# We put the qte profile into it's own package as we don't want to install all qt stuff
> +# with depending on the global package qt4-embedded
> +PACKAGES += " ${PN}-conf"
> +FILES_${PN}-conf += " ${sysconfdir}/profile.d/qte.sh"
> +RDEPENDS_${PN} += " ${PN}-conf"
>
> inherit qt4e
>
Merged into OE-Core
Thanks
Sau!
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-09-28 16:13 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-25 12:57 [PATCH 1/2] meta: qt4: fix postprocessing of pkg-config files Simon Busch
2011-09-25 12:57 ` [PATCH 2/2] qt4-embedded: move qte.sh profile script into own package Simon Busch
2011-09-28 16:06 ` Saul Wold
2011-09-28 16:06 ` [PATCH 1/2] meta: qt4: fix postprocessing of pkg-config files Saul Wold
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox