0016-configure-eval-QMAKE_CXX.patch 1.0 KB

12345678910111213141516171819202122232425262728293031323334353637
  1. From 8403634a71f067eec514b6d2193cf41e281dff8e Mon Sep 17 00:00:00 2001
  2. From: Paul Eggleton <paul.eggleton@linux.intel.com>
  3. Date: Wed, 26 Sep 2012 20:47:08 +0200
  4. Subject: [PATCH 16/21] configure: eval QMAKE_CXX
  5. Allow expansion of $(...) references in QMAKE_CXX (currently its value
  6. is $(OE_QMAKE_CXX)) in order to allow compiler version check to succeed
  7. which allows WebKit to be enabled.
  8. Upstream-Status: Pending
  9. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
  10. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  11. Conflicts:
  12. configure
  13. ---
  14. configure | 3 ++-
  15. 1 file changed, 2 insertions(+), 1 deletion(-)
  16. diff --git a/configure b/configure
  17. index d02824b..891d6e7 100755
  18. --- a/configure
  19. +++ b/configure
  20. @@ -3409,7 +3409,8 @@ else
  21. CFG_FRAMEWORK=no
  22. fi
  23. -QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`
  24. +QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX | sed -n 's/$[(]\([0-9a-zA-Z_]*\)[)]/$\1/pg'`
  25. +QMAKE_CONF_COMPILER=`eval "echo $QMAKE_CONF_COMPILER"`
  26. TEST_COMPILER="$CXX"
  27. [ -z "$TEST_COMPILER" ] && TEST_COMPILER=$QMAKE_CONF_COMPILER
  28. --
  29. 1.8.0