summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorDmitry Cherukhin <dima_ch@emcraft.com>2011-11-08 13:28:52 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-11 11:01:06 (GMT)
commit298278257bdba9c684ae293351b1cf421b5b3e50 (patch)
treed155651a1b9689695d895911a8770e69ca8b313f /meta/recipes-qt
parent78d1b4458631cb4eada176fbc816e1a9f0a022ab (diff)
downloadpoky-298278257bdba9c684ae293351b1cf421b5b3e50.tar.gz
qt-mobility: qa_configure stage failed
The catalogue /usr/lib removed from Makefiles used for building configure tests. (From OE-Core rev: 815560c0ee5a1a984b7d0fc8417c46606854e7fe) Signed-off-by: Dmitry Cherukhin <dima_ch@emcraft.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/qt4/files/qt-mobility-configure.patch17
-rw-r--r--meta/recipes-qt/qt4/qt-mobility_1.2.0.inc3
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 0000000..d61ec03
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/qt-mobility-configure.patch
@@ -0,0 +1,17 @@
1When building qt-mobility, the qa_configure stage failed because the catalogue /usr/lib
2is used in some Makefiles within configure tests. We manually removed this catalogue.
3
4Upstream-Status: Inappropriate [embedded]
5Signed-off-by: Dmitry Cherukhin <dima_ch@emcraft.com>
6
7--- qt-mobility-opensource-src-1.2.0/configure.orig 2011-05-10 10:06:01.000000000 +0200
8+++ qt-mobility-opensource-src-1.2.0/configure 2011-11-08 12:34:56.347645968 +0100
9@@ -583,6 +583,8 @@
10 fi
11
12 $QMAKE_EXEC $QMKSPEC "$relpath/config.tests/$2/$2.pro" 2>> "$CONFIG_LOG" >> "$CONFIG_LOG"
13+ cp Makefile Makefile.old
14+ sed -e 's@-L/usr/lib@@' <Makefile.old >Makefile
15 printf " ."
16 "$MAKE" clean >> "$CONFIG_LOG"
17 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"
5LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \ 5LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
6 file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354" 6 file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
7 7
8SRC_URI = "http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-${PV}.tar.gz " 8SRC_URI = "http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-${PV}.tar.gz \
9 file://qt-mobility-configure.patch "
9 10
10SRC_URI[md5sum]="ea5db5a8d3dd4709c2926dceda646bd8" 11SRC_URI[md5sum]="ea5db5a8d3dd4709c2926dceda646bd8"
11SRC_URI[sha256sum]="ee3c88975e04139ac9589f76d4be646d44fcbc4c8c1cf2db621abc154cf0ba44" 12SRC_URI[sha256sum]="ee3c88975e04139ac9589f76d4be646d44fcbc4c8c1cf2db621abc154cf0ba44"