diff options
| author | Dmitry Cherukhin <dima_ch@emcraft.com> | 2011-11-08 14:28:52 +0100 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2011-11-11 00:33:49 -0800 |
| commit | 815560c0ee5a1a984b7d0fc8417c46606854e7fe (patch) | |
| tree | d178270b75269012f3bc3ad176e8e289267dd994 /meta/recipes-qt/qt4 | |
| parent | 379c77d1516fe8fdbd1cd7063f709b5266872b03 (diff) | |
| download | openembedded-core-815560c0ee5a1a984b7d0fc8417c46606854e7fe.tar.gz openembedded-core-815560c0ee5a1a984b7d0fc8417c46606854e7fe.tar.bz2 openembedded-core-815560c0ee5a1a984b7d0fc8417c46606854e7fe.zip | |
qt-mobility: qa_configure stage failed
The catalogue /usr/lib removed from Makefiles used for building configure tests.
Signed-off-by: Dmitry Cherukhin <dima_ch@emcraft.com>
Diffstat (limited to 'meta/recipes-qt/qt4')
| -rw-r--r-- | meta/recipes-qt/qt4/files/qt-mobility-configure.patch | 17 | ||||
| -rw-r--r-- | meta/recipes-qt/qt4/qt-mobility_1.2.0.inc | 3 |
2 files changed, 19 insertions, 1 deletions
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 0000000000..d61ec03341 --- /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 f665e64162..11aad8b25d 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" |