Patchwork qt-mobility: qa_configure stage failed

login
register
mail settings
Submitter Dmitry Cherukhin
Date Nov. 8, 2011, 1:28 p.m.
Message ID <1320758932-4181-1-git-send-email-dima_ch@emcraft.com>
Download mbox | patch
Permalink /patch/14517/
State Accepted
Commit 815560c0ee5a1a984b7d0fc8417c46606854e7fe
Headers show

Comments

Dmitry Cherukhin - Nov. 8, 2011, 1:28 p.m.
The catalogue /usr/lib removed from Makefiles used for building configure tests.

Signed-off-by: Dmitry Cherukhin <dima_ch@emcraft.com>
---
 .../qt4/files/qt-mobility-configure.patch          |   17 +++++++++++++++++
 meta/recipes-qt/qt4/qt-mobility_1.2.0.inc          |    3 ++-
 2 files changed, 19 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-qt/qt4/files/qt-mobility-configure.patch
Otavio Salvador - Nov. 8, 2011, 1:42 p.m.
On Tue, Nov 8, 2011 at 11:28, Dmitry Cherukhin <dima_ch@emcraft.com> wrote:
...
> +     $QMAKE_EXEC $QMKSPEC "$relpath/config.tests/$2/$2.pro" 2>> "$CONFIG_LOG" >> "$CONFIG_LOG"
> ++    cp Makefile Makefile.old
> ++    sed -e 's@-L/usr/lib@@' <Makefile.old >Makefile
...

You can use 'sed -i '
Saul Wold - Nov. 8, 2011, 6:14 p.m.
On 11/08/2011 05:28 AM, Dmitry Cherukhin wrote:
> The catalogue /usr/lib removed from Makefiles used for building configure tests.
>
Even with this patch, I am still seeing Host Contamination issue with 
all the QtMobility recipes.

Sau!

> Signed-off-by: Dmitry Cherukhin<dima_ch@emcraft.com>
> ---
>   .../qt4/files/qt-mobility-configure.patch          |   17 +++++++++++++++++
>   meta/recipes-qt/qt4/qt-mobility_1.2.0.inc          |    3 ++-
>   2 files changed, 19 insertions(+), 1 deletions(-)
>   create mode 100644 meta/recipes-qt/qt4/files/qt-mobility-configure.patch
>
> diff --git a/meta/recipes-qt/qt4/files/qt-mobility-configure.patch b/meta/recipes-qt/qt4/files/qt-mobility-configure.patch
> new file mode 100644
> index 0000000..d61ec03
> --- /dev/null
> +++ b/meta/recipes-qt/qt4/files/qt-mobility-configure.patch
> @@ -0,0 +1,17 @@
> +When building qt-mobility, the qa_configure stage failed because the catalogue /usr/lib
> +is used in some Makefiles within configure tests. We manually removed this catalogue.
> +
> +Upstream-Status: Inappropriate [embedded]
> +Signed-off-by: Dmitry Cherukhin<dima_ch@emcraft.com>
> +
> +--- qt-mobility-opensource-src-1.2.0/configure.orig	2011-05-10 10:06:01.000000000 +0200
> ++++ qt-mobility-opensource-src-1.2.0/configure	2011-11-08 12:34:56.347645968 +0100
> +@@ -583,6 +583,8 @@
> +     fi
> +
> +     $QMAKE_EXEC $QMKSPEC "$relpath/config.tests/$2/$2.pro" 2>>  "$CONFIG_LOG">>  "$CONFIG_LOG"
> ++    cp Makefile Makefile.old
> ++    sed -e 's@-L/usr/lib@@'<Makefile.old>Makefile
> +     printf  " ."
> +     "$MAKE" clean>>  "$CONFIG_LOG"
> +     printf "."
> diff --git a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
> index f665e64..11aad8b 100644
> --- a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
> +++ b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
> @@ -5,7 +5,8 @@ LICENSE = "LGPLv2.1"
>   LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
>   		    file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
>
> -SRC_URI = "http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-${PV}.tar.gz "
> +SRC_URI = "http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-${PV}.tar.gz \
> +	   file://qt-mobility-configure.patch "
>
>   SRC_URI[md5sum]="ea5db5a8d3dd4709c2926dceda646bd8"
>   SRC_URI[sha256sum]="ee3c88975e04139ac9589f76d4be646d44fcbc4c8c1cf2db621abc154cf0ba44"
Dmitry Cherukhin - Nov. 9, 2011, 11:36 a.m.
Saul,

> Even with this patch, I am still seeing Host Contamination issue with 
> all the QtMobility recipes.
> 

I performed git pull and then rebuilt all packages. Both qt-mobility
recipes built successfully. Do you mean that your build is still failed,
or the build is not failed but there are some warnings? If the build is
failed, then could you please provide the file
.../tmp/work/armv5te-poky-linux-gnueabi/qt-mobility-embedded-1.2.0-r0/qt-mobility-opensource-src-1.2.0/config.log ?

Dima

> Sau!
> 
> > Signed-off-by: Dmitry Cherukhin<dima_ch@emcraft.com>
> > ---
> >   .../qt4/files/qt-mobility-configure.patch          |   17 +++++++++++++++++
> >   meta/recipes-qt/qt4/qt-mobility_1.2.0.inc          |    3 ++-
> >   2 files changed, 19 insertions(+), 1 deletions(-)
> >   create mode 100644 meta/recipes-qt/qt4/files/qt-mobility-configure.patch
> >
> > diff --git a/meta/recipes-qt/qt4/files/qt-mobility-configure.patch b/meta/recipes-qt/qt4/files/qt-mobility-configure.patch
> > new file mode 100644
> > index 0000000..d61ec03
> > --- /dev/null
> > +++ b/meta/recipes-qt/qt4/files/qt-mobility-configure.patch
> > @@ -0,0 +1,17 @@
> > +When building qt-mobility, the qa_configure stage failed because the catalogue /usr/lib
> > +is used in some Makefiles within configure tests. We manually removed this catalogue.
> > +
> > +Upstream-Status: Inappropriate [embedded]
> > +Signed-off-by: Dmitry Cherukhin<dima_ch@emcraft.com>
> > +
> > +--- qt-mobility-opensource-src-1.2.0/configure.orig	2011-05-10 10:06:01.000000000 +0200
> > ++++ qt-mobility-opensource-src-1.2.0/configure	2011-11-08 12:34:56.347645968 +0100
> > +@@ -583,6 +583,8 @@
> > +     fi
> > +
> > +     $QMAKE_EXEC $QMKSPEC "$relpath/config.tests/$2/$2.pro" 2>>  "$CONFIG_LOG">>  "$CONFIG_LOG"
> > ++    cp Makefile Makefile.old
> > ++    sed -e 's@-L/usr/lib@@'<Makefile.old>Makefile
> > +     printf  " ."
> > +     "$MAKE" clean>>  "$CONFIG_LOG"
> > +     printf "."
> > diff --git a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
> > index f665e64..11aad8b 100644
> > --- a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
> > +++ b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
> > @@ -5,7 +5,8 @@ LICENSE = "LGPLv2.1"
> >   LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
> >   		    file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
> >
> > -SRC_URI = "http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-${PV}.tar.gz "
> > +SRC_URI = "http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-${PV}.tar.gz \
> > +	   file://qt-mobility-configure.patch "
> >
> >   SRC_URI[md5sum]="ea5db5a8d3dd4709c2926dceda646bd8"
> >   SRC_URI[sha256sum]="ee3c88975e04139ac9589f76d4be646d44fcbc4c8c1cf2db621abc154cf0ba44"
Saul Wold - Nov. 12, 2011, 12:14 a.m.
On 11/08/2011 05:28 AM, Dmitry Cherukhin wrote:
> The catalogue /usr/lib removed from Makefiles used for building configure tests.
>
> Signed-off-by: Dmitry Cherukhin<dima_ch@emcraft.com>
> ---
>   .../qt4/files/qt-mobility-configure.patch          |   17 +++++++++++++++++
>   meta/recipes-qt/qt4/qt-mobility_1.2.0.inc          |    3 ++-
>   2 files changed, 19 insertions(+), 1 deletions(-)
>   create mode 100644 meta/recipes-qt/qt4/files/qt-mobility-configure.patch
>
> diff --git a/meta/recipes-qt/qt4/files/qt-mobility-configure.patch b/meta/recipes-qt/qt4/files/qt-mobility-configure.patch
> new file mode 100644
> index 0000000..d61ec03
> --- /dev/null
> +++ b/meta/recipes-qt/qt4/files/qt-mobility-configure.patch
> @@ -0,0 +1,17 @@
> +When building qt-mobility, the qa_configure stage failed because the catalogue /usr/lib
> +is used in some Makefiles within configure tests. We manually removed this catalogue.
> +
> +Upstream-Status: Inappropriate [embedded]
> +Signed-off-by: Dmitry Cherukhin<dima_ch@emcraft.com>
> +
> +--- qt-mobility-opensource-src-1.2.0/configure.orig	2011-05-10 10:06:01.000000000 +0200
> ++++ qt-mobility-opensource-src-1.2.0/configure	2011-11-08 12:34:56.347645968 +0100
> +@@ -583,6 +583,8 @@
> +     fi
> +
> +     $QMAKE_EXEC $QMKSPEC "$relpath/config.tests/$2/$2.pro" 2>>  "$CONFIG_LOG">>  "$CONFIG_LOG"
> ++    cp Makefile Makefile.old
> ++    sed -e 's@-L/usr/lib@@'<Makefile.old>Makefile
> +     printf  " ."
> +     "$MAKE" clean>>  "$CONFIG_LOG"
> +     printf "."
> diff --git a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
> index f665e64..11aad8b 100644
> --- a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
> +++ b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
> @@ -5,7 +5,8 @@ LICENSE = "LGPLv2.1"
>   LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
>   		    file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
>
> -SRC_URI = "http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-${PV}.tar.gz "
> +SRC_URI = "http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-${PV}.tar.gz \
> +	   file://qt-mobility-configure.patch "
>
>   SRC_URI[md5sum]="ea5db5a8d3dd4709c2926dceda646bd8"
>   SRC_URI[sha256sum]="ee3c88975e04139ac9589f76d4be646d44fcbc4c8c1cf2db621abc154cf0ba44"

Problem solved, I had a goofed up build.

This is merged into OE-Core

Thanks
	Sau!

Patch

diff --git a/meta/recipes-qt/qt4/files/qt-mobility-configure.patch b/meta/recipes-qt/qt4/files/qt-mobility-configure.patch
new file mode 100644
index 0000000..d61ec03
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/qt-mobility-configure.patch
@@ -0,0 +1,17 @@ 
+When building qt-mobility, the qa_configure stage failed because the catalogue /usr/lib
+is used in some Makefiles within configure tests. We manually removed this catalogue.
+
+Upstream-Status: Inappropriate [embedded]
+Signed-off-by: Dmitry Cherukhin <dima_ch@emcraft.com>
+
+--- qt-mobility-opensource-src-1.2.0/configure.orig	2011-05-10 10:06:01.000000000 +0200
++++ qt-mobility-opensource-src-1.2.0/configure	2011-11-08 12:34:56.347645968 +0100
+@@ -583,6 +583,8 @@
+     fi
+ 
+     $QMAKE_EXEC $QMKSPEC "$relpath/config.tests/$2/$2.pro" 2>> "$CONFIG_LOG" >> "$CONFIG_LOG"
++    cp Makefile Makefile.old
++    sed -e 's@-L/usr/lib@@' <Makefile.old >Makefile
+     printf  " ."
+     "$MAKE" clean >> "$CONFIG_LOG"
+     printf "."
diff --git a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
index f665e64..11aad8b 100644
--- a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
+++ b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
@@ -5,7 +5,8 @@  LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
 		    file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
 
-SRC_URI = "http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-${PV}.tar.gz "
+SRC_URI = "http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-${PV}.tar.gz \
+	   file://qt-mobility-configure.patch "
 
 SRC_URI[md5sum]="ea5db5a8d3dd4709c2926dceda646bd8"
 SRC_URI[sha256sum]="ee3c88975e04139ac9589f76d4be646d44fcbc4c8c1cf2db621abc154cf0ba44"