[OE-core] [PATCH 1/4] qt4: fix compile error in Qt 4.8.0 with gcc 4.6

[Koen Kooi]

Op 26 feb. 2012, om 23:27 heeft Paul Eggleton het volgende geschreven:

> 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]
> 
> Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
> ---
> meta/recipes-qt/qt4/qt-4.8.0.inc                   |    1 +
> .../qt4/qt-4.8.0/configure_oe_compiler.patch       |   31 ++++++++++++++++++++
> meta/recipes-qt/qt4/qt4-embedded_4.8.0.bb          |    2 +-
> 3 files changed, 33 insertions(+), 1 deletions(-)
> create mode 100644 meta/recipes-qt/qt4/qt-4.8.0/configure_oe_compiler.patch
> 
> 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}.
>            file://fix-translations.patch \
>            file://add_nostrip_for_debug_packages.diff \
>            file://qmake_cxx_eval.patch \
> +           file://configure_oe_compiler.patch \
>            file://g++.conf \
>            file://linux.conf \
>            "
> 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 @@
> +Ensure we identify the compiler as g++ in configure
> +
> +Our PLATFORM in OE is ${TARGET_OS}-oe-g++, and previously the configure
> +script was interpreting from this that the compiler was "oe-g++" and thus
> +g++ specific checks were not being run since this string did not match;
> +among other things this resulted in a compiler version check in the
> +QtWebKit build code not working, and hence the following error at build
> +time:
> +
> +./wtf/NullPtr.h:48:1: error: identifier 'nullptr' will become a keyword in C++0x [-Werror=c++0x-compat]
> +
> +The easiest thing since our PLATFORM is entirely artificial is to just
> +force COMPILER to "g++" in the configure script if it is detected as
> +"oe-g++".
> +
> +Upstream-Status: Inappropriate [configuration]
> +
> +Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>

Can I bribe you to make those proper git patches? :)

regards,

Koen