diff options
author | Dmitry Cherukhin <dima_ch@emcraft.com> | 2011-11-08 14:28:52 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-11 11:01:06 +0000 |
commit | 298278257bdba9c684ae293351b1cf421b5b3e50 (patch) | |
tree | d155651a1b9689695d895911a8770e69ca8b313f /meta/recipes-qt/qt4/files | |
parent | 78d1b4458631cb4eada176fbc816e1a9f0a022ab (diff) | |
download | poky-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/qt4/files')
-rw-r--r-- | meta/recipes-qt/qt4/files/qt-mobility-configure.patch | 17 |
1 files changed, 17 insertions, 0 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 @@ | |||
1 | When building qt-mobility, the qa_configure stage failed because the catalogue /usr/lib | ||
2 | is used in some Makefiles within configure tests. We manually removed this catalogue. | ||
3 | |||
4 | Upstream-Status: Inappropriate [embedded] | ||
5 | Signed-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 "." | ||