diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-01-03 13:41:33 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-04 12:08:18 +0000 |
commit | 6b2a5d15ad20573502142b635e6cab9bcfb3b40a (patch) | |
tree | c1ee9f5c1dc2fbc8ca7fc62e51f10c15c9e7bef7 /meta/recipes-qt/qt4/qt-4.8.0/qmake_cxx_eval.patch | |
parent | dc154d698b3b455a35b65935f7f04a3b4f72f8b6 (diff) | |
download | openembedded-core-6b2a5d15ad20573502142b635e6cab9bcfb3b40a.tar.gz openembedded-core-6b2a5d15ad20573502142b635e6cab9bcfb3b40a.tar.bz2 openembedded-core-6b2a5d15ad20573502142b635e6cab9bcfb3b40a.tar.xz openembedded-core-6b2a5d15ad20573502142b635e6cab9bcfb3b40a.zip |
qt4: add version 4.8.0
Version 4.8.0 makes a few minor changes in the internal build system -
the following issues had to be worked around:
* The -qt-gif configure option has been removed. This is actually the
default and has been for some time, so remove it from qt4.inc.
* The mkspecs have been refactored requiring us to copy our g++.conf
file over the top of g++-unix.conf instead. Some modifications to this
file were also necessary to remove some settings that are now in other
conf files (and we don't modify those values in any case).
* The LD environment variable needs to be unset during configure, or
else the configure script overrides our value of QMAKE_LINK which
selects ${CXX} as our linker.
* QMAKE_CXX contains a reference to OE_QMAKE_CXX which the configure
script does not expect and cannot expand and this results in webkit
being disabled, so add a workaround for this.
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/qt4/qt-4.8.0/qmake_cxx_eval.patch')
-rw-r--r-- | meta/recipes-qt/qt4/qt-4.8.0/qmake_cxx_eval.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.8.0/qmake_cxx_eval.patch b/meta/recipes-qt/qt4/qt-4.8.0/qmake_cxx_eval.patch new file mode 100644 index 000000000..a82f0ff9d --- /dev/null +++ b/meta/recipes-qt/qt4/qt-4.8.0/qmake_cxx_eval.patch @@ -0,0 +1,20 @@ +Allow expansion of $(...) references in QMAKE_CXX (currently its value +is $(OE_QMAKE_CXX)) in order to allow compiler version check to succeed +which allows WebKit to be enabled. + +Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> + +Index: qt-everywhere-opensource-src-4.8.0/configure +=================================================================== +--- qt-everywhere-opensource-src-4.8.0.orig/configure ++++ qt-everywhere-opensource-src-4.8.0/configure +@@ -3322,7 +3322,8 @@ else + CFG_FRAMEWORK=no + fi + +-QMAKE_CONF_COMPILER=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CXX[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1," | tail -1` ++QMAKE_CONF_COMPILER=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CXX[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1," | sed -n 's/$[(]\([0-9a-zA-Z_]*\)[)]/$\1/pg' | tail -1` ++QMAKE_CONF_COMPILER=`eval "echo $QMAKE_CONF_COMPILER"` + TEST_COMPILER="$CXX" + + [ -z "$TEST_COMPILER" ] && TEST_COMPILER=$QMAKE_CONF_COMPILER |