diff options
| author | Andreas Oberritter <obi@opendreambox.org> | 2012-03-28 21:46:55 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-24 11:35:50 +0100 |
| commit | 6a21cf0068234152b3f13866dc7c05adc6d0d9c9 (patch) | |
| tree | 03f1cd976bdef536062ff0bab925b7227975a2ba /meta/recipes-qt/qt4/qt-4.8.1/qmake_cxx_eval.patch | |
| parent | 971361a4fac5622858f71a87c478e16ef02c4d76 (diff) | |
| download | openembedded-core-6a21cf0068234152b3f13866dc7c05adc6d0d9c9.tar.gz openembedded-core-6a21cf0068234152b3f13866dc7c05adc6d0d9c9.tar.bz2 openembedded-core-6a21cf0068234152b3f13866dc7c05adc6d0d9c9.tar.xz openembedded-core-6a21cf0068234152b3f13866dc7c05adc6d0d9c9.zip | |
qt4: move from 4.8.0 to 4.8.1
* No changes other than source checksums and PR at recipe level.
* DEFAULT_PREFERENCE still set to -1
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt-4.8.1/qmake_cxx_eval.patch')
| -rw-r--r-- | meta/recipes-qt/qt4/qt-4.8.1/qmake_cxx_eval.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.8.1/qmake_cxx_eval.patch b/meta/recipes-qt/qt4/qt-4.8.1/qmake_cxx_eval.patch new file mode 100644 index 000000000..d5eac6b16 --- /dev/null +++ b/meta/recipes-qt/qt4/qt-4.8.1/qmake_cxx_eval.patch @@ -0,0 +1,22 @@ +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> + +Upstream-Status: Pending + +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 |