0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch 1.4 KB

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