summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt4-4.8.3/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.3/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch')
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.3/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch46
1 files changed, 46 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch
new file mode 100644
index 0000000000..ef32932eef
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch
@@ -0,0 +1,46 @@
1From 5945025c96fd25880565819881b8ef48e1baa3ce Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.intel.com>
3Date: Wed, 26 Sep 2012 20:48:37 +0200
4Subject: [PATCH 17/20] configure: ensure we identify the compiler as g++ in
5 configure
6
7Our PLATFORM in OE is ${TARGET_OS}-oe-g++, and previously the configure
8script was interpreting from this that the compiler was "oe-g++" and
9thus
10g++ specific checks were not being run since this string did not match;
11among other things this resulted in a compiler version check in the
12QtWebKit build code not working, and hence the following error at build
13time:
14
15./wtf/NullPtr.h:48:1: error: identifier 'nullptr' will become a keyword
16in C++0x [-Werror=c++0x-compat]
17
18The easiest thing since our PLATFORM is entirely artificial is to just
19force COMPILER to "g++" in the configure script if it is detected as
20"oe-g++".
21
22Upstream-Status: Inappropriate [configuration]
23
24Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
25Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
26---
27 configure | 3 +++
28 1 file changed, 3 insertions(+)
29
30diff --git a/configure b/configure
31index 9f59e1a..6989962 100755
32--- a/configure
33+++ b/configure
34@@ -7527,6 +7527,9 @@ elif [ "$XPLATFORM" != "$PLATFORM" ]; then
35 else
36 COMPILER=`echo $PLATFORM | cut -f 2- -d-`
37 fi
38+case $COMPILER in
39+ *oe-g++) COMPILER="g++" ;;
40+esac
41 if [ "$CFG_EXCEPTIONS" = "unspecified" -a "$PLATFORM_QWS" = "yes" ]; then
42 CFG_EXCEPTIONS=no
43 fi
44--
451.7.12
46