From: Dmitry Cherukhin <dima_ch@emcraft.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH] qt-mobility: qa_configure stage failed
Date: Tue, 8 Nov 2011 14:28:52 +0100 [thread overview]
Message-ID: <1320758932-4181-1-git-send-email-dima_ch@emcraft.com> (raw)
In-Reply-To: <135de91f015deb0c4e3c3d01d83963fc20ecc5f7>
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"
--
1.7.6.4
next parent reply other threads:[~2011-11-08 13:35 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <135de91f015deb0c4e3c3d01d83963fc20ecc5f7>
2011-11-08 13:28 ` Dmitry Cherukhin [this message]
2011-11-08 13:42 ` [PATCH] qt-mobility: qa_configure stage failed Otavio Salvador
2011-11-08 18:14 ` Saul Wold
2011-11-09 11:36 ` Dmitry Cherukhin
2011-11-12 0:14 ` Saul Wold
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1320758932-4181-1-git-send-email-dima_ch@emcraft.com \
--to=dima_ch@emcraft.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox