From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from host-82-135-33-74.customer.m-online.net ([82.135.33.74] helo=sisyphus.denx.de) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1RNlpo-0003sU-Q7 for openembedded-core@lists.openembedded.org; Tue, 08 Nov 2011 14:35:28 +0100 Received: by sisyphus.denx.de (Postfix, from userid 556) id 9F2D74135B0C; Tue, 8 Nov 2011 14:29:14 +0100 (CET) From: Dmitry Cherukhin To: openembedded-core@lists.openembedded.org Date: Tue, 8 Nov 2011 14:28:52 +0100 Message-Id: <1320758932-4181-1-git-send-email-dima_ch@emcraft.com> X-Mailer: git-send-email 1.7.6.4 In-Reply-To: <135de91f015deb0c4e3c3d01d83963fc20ecc5f7> References: <135de91f015deb0c4e3c3d01d83963fc20ecc5f7> Subject: [PATCH] qt-mobility: qa_configure stage failed X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Nov 2011 13:35:28 -0000 The catalogue /usr/lib removed from Makefiles used for building configure tests. Signed-off-by: Dmitry Cherukhin --- .../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 + +--- 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 + 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