diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-01-21 16:22:15 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-01 16:10:36 +0000 |
commit | 51b50818922a1be99f50cc1e3386ca914c025427 (patch) | |
tree | 4f96f7e2de83bea7f099c5ac4fa3e1896cd3823b /meta/recipes-qt/qt4/qt-4.7.1/hack-out-pg2-4.7.0.patch | |
parent | 7263adda21f58e0f76b0228b0f5657aa84879927 (diff) | |
download | openembedded-core-contrib-51b50818922a1be99f50cc1e3386ca914c025427.tar.gz |
qt4: add 4.7.1 version from meta-openembedded
Differences from meta-openembedded version:
* Change the order of includes so that embedded/x11 overrides take precedence
* Move contents of do_install_append from qt-${PV}.inc to do_install in
qt4.inc as this is the same for 4.6.3 and 4.7.1 and gets in the way of
do_install_append in qt-embedded.inc.
* Don't add qte.sh to SRC_URI in qt-4.7.1.inc (this is embedded-specific)
* Don't specify DEFAULT_PREFERENCE
* Use http source URL to match other Qt4 recipes
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'meta/recipes-qt/qt4/qt-4.7.1/hack-out-pg2-4.7.0.patch')
-rw-r--r-- | meta/recipes-qt/qt4/qt-4.7.1/hack-out-pg2-4.7.0.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.7.1/hack-out-pg2-4.7.0.patch b/meta/recipes-qt/qt4/qt-4.7.1/hack-out-pg2-4.7.0.patch new file mode 100644 index 0000000000..5c588ff0f7 --- /dev/null +++ b/meta/recipes-qt/qt4/qt-4.7.1/hack-out-pg2-4.7.0.patch @@ -0,0 +1,19 @@ +Index: qt-everywhere-opensource-src-4.7.0/configure +=================================================================== +--- qt-everywhere-opensource-src-4.7.0.orig/configure 2010-09-22 15:43:51.191162141 -0400 ++++ qt-everywhere-opensource-src-4.7.0/configure 2010-09-22 15:44:35.179981232 -0400 +@@ -4921,10 +4921,10 @@ + psql) + if [ "$CFG_SQL_psql" != "no" ]; then + # Be careful not to use native pg_config when cross building. +- if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then +- QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null` +- QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null` +- fi ++# if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then ++# QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null` ++# QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null` ++# fi + [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL" + [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL" + # But, respect PSQL_LIBS if set |