diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2012-09-26 20:00:58 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-02 17:19:26 +0100 |
commit | a0a29221c8df7c277139b0c875330f08cb2bdea3 (patch) | |
tree | 967c8777a198f33333e458ca8579fe896c784e99 /meta/recipes-qt/qt4/qt4-4.8.1/configure_oe_compiler.patch | |
parent | 248e9f48c77212372b50074f0a475a16bb8db4be (diff) | |
download | poky-a0a29221c8df7c277139b0c875330f08cb2bdea3.tar.gz |
qt4: rename qt-4.8.1 to qt4-4.8.1 to match other .inc and .bb
(From OE-Core rev: dcda03d3f6ec442740e3683a1971103dc639689d)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.1/configure_oe_compiler.patch')
-rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.1/configure_oe_compiler.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/configure_oe_compiler.patch b/meta/recipes-qt/qt4/qt4-4.8.1/configure_oe_compiler.patch new file mode 100644 index 0000000000..d455d0acfe --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.1/configure_oe_compiler.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | Ensure we identify the compiler as g++ in configure | ||
2 | |||
3 | Our PLATFORM in OE is ${TARGET_OS}-oe-g++, and previously the configure | ||
4 | script was interpreting from this that the compiler was "oe-g++" and thus | ||
5 | g++ specific checks were not being run since this string did not match; | ||
6 | among other things this resulted in a compiler version check in the | ||
7 | QtWebKit build code not working, and hence the following error at build | ||
8 | time: | ||
9 | |||
10 | ./wtf/NullPtr.h:48:1: error: identifier 'nullptr' will become a keyword in C++0x [-Werror=c++0x-compat] | ||
11 | |||
12 | The easiest thing since our PLATFORM is entirely artificial is to just | ||
13 | force COMPILER to "g++" in the configure script if it is detected as | ||
14 | "oe-g++". | ||
15 | |||
16 | Upstream-Status: Inappropriate [configuration] | ||
17 | |||
18 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
19 | |||
20 | --- qt-everywhere-opensource-src-4.8.0.orig/configure | ||
21 | +++ qt-everywhere-opensource-src-4.8.0/configure | ||
22 | @@ -7444,6 +7444,9 @@ elif [ "$XPLATFORM" != "$PLATFORM" ]; th | ||
23 | else | ||
24 | COMPILER=`echo $PLATFORM | cut -f 2- -d-` | ||
25 | fi | ||
26 | +case $COMPILER in | ||
27 | + *oe-g++) COMPILER="g++" ;; | ||
28 | +esac | ||
29 | if [ "$CFG_EXCEPTIONS" = "unspecified" -a "$PLATFORM_QWS" = "yes" ]; then | ||
30 | CFG_EXCEPTIONS=no | ||
31 | fi | ||