summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-02-08 13:21:59 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-28 12:27:24 (GMT)
commit76c17122024e49fdc84e237b9d5dde6525778d6b (patch)
tree0369711d3e9fce2eae44a7fb8be583b911fc9e19 /meta/recipes-qt
parentcf87669e7c1d228fa26212b7747a5a8018f04b96 (diff)
downloadpoky-76c17122024e49fdc84e237b9d5dde6525778d6b.tar.gz
qt4: fix compile error in Qt 4.8.0 with gcc 4.6
Ensure the Qt configure script can can detect the compiler correctly as g++. This fixes the following compile error with gcc 4.6: ./wtf/NullPtr.h:48:1: error: identifier 'nullptr' will become a keyword in C++0x [-Werror=c++0x-compat] (From OE-Core rev: f29bb5b2a99ecef46e5570bf3336e9680c0b6705) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/qt4/qt-4.8.0.inc1
-rw-r--r--meta/recipes-qt/qt4/qt-4.8.0/configure_oe_compiler.patch31
-rw-r--r--meta/recipes-qt/qt4/qt4-embedded_4.8.0.bb2
3 files changed, 33 insertions, 1 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.8.0.inc b/meta/recipes-qt/qt4/qt-4.8.0.inc
index 2addbb2..532f1ff 100644
--- a/meta/recipes-qt/qt4/qt-4.8.0.inc
+++ b/meta/recipes-qt/qt4/qt-4.8.0.inc
@@ -14,6 +14,7 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
14 file://fix-translations.patch \ 14 file://fix-translations.patch \
15 file://add_nostrip_for_debug_packages.diff \ 15 file://add_nostrip_for_debug_packages.diff \
16 file://qmake_cxx_eval.patch \ 16 file://qmake_cxx_eval.patch \
17 file://configure_oe_compiler.patch \
17 file://g++.conf \ 18 file://g++.conf \
18 file://linux.conf \ 19 file://linux.conf \
19 " 20 "
diff --git a/meta/recipes-qt/qt4/qt-4.8.0/configure_oe_compiler.patch b/meta/recipes-qt/qt4/qt-4.8.0/configure_oe_compiler.patch
new file mode 100644
index 0000000..d455d0a
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-4.8.0/configure_oe_compiler.patch
@@ -0,0 +1,31 @@
1Ensure we identify the compiler as g++ in configure
2
3Our PLATFORM in OE is ${TARGET_OS}-oe-g++, and previously the configure
4script was interpreting from this that the compiler was "oe-g++" and thus
5g++ specific checks were not being run since this string did not match;
6among other things this resulted in a compiler version check in the
7QtWebKit build code not working, and hence the following error at build
8time:
9
10./wtf/NullPtr.h:48:1: error: identifier 'nullptr' will become a keyword in C++0x [-Werror=c++0x-compat]
11
12The easiest thing since our PLATFORM is entirely artificial is to just
13force COMPILER to "g++" in the configure script if it is detected as
14"oe-g++".
15
16Upstream-Status: Inappropriate [configuration]
17
18Signed-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
diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.8.0.bb b/meta/recipes-qt/qt4/qt4-embedded_4.8.0.bb
index 5c1c97e..efbc02a 100644
--- a/meta/recipes-qt/qt4/qt4-embedded_4.8.0.bb
+++ b/meta/recipes-qt/qt4/qt4-embedded_4.8.0.bb
@@ -1,7 +1,7 @@
1require qt-${PV}.inc 1require qt-${PV}.inc
2require qt4-embedded.inc 2require qt4-embedded.inc
3 3
4PR = "${INC_PR}.0" 4PR = "${INC_PR}.1"
5 5
6DEFAULT_PREFERENCE = "-1" 6DEFAULT_PREFERENCE = "-1"
7 7