diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2012-09-26 21:00:04 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-02 17:19:28 +0100 |
| commit | aea363afaa193feee774dad30d81c516ea4a98fc (patch) | |
| tree | 00b6ca102fe4b7c09da87d482ec04a90d128e03c /meta/recipes-qt/qt4/qt4-4.8.1/hack-out-pg2-4.7.0.patch | |
| parent | 425df23c02b7dad3c843ec9959a51337ab450cd1 (diff) | |
| download | ast2050-yocto-poky-aea363afaa193feee774dad30d81c516ea4a98fc.zip ast2050-yocto-poky-aea363afaa193feee774dad30d81c516ea4a98fc.tar.gz | |
qt4: replace all local patches with git patches with headers
* in preparation for upgrade to 4.8.3
(From OE-Core rev: 24bf06bbcda4c0dfdad33cdff6394faa52657bb9)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.1/hack-out-pg2-4.7.0.patch')
| -rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.1/hack-out-pg2-4.7.0.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/hack-out-pg2-4.7.0.patch b/meta/recipes-qt/qt4/qt4-4.8.1/hack-out-pg2-4.7.0.patch deleted file mode 100644 index 39c5f4a..0000000 --- a/meta/recipes-qt/qt4/qt4-4.8.1/hack-out-pg2-4.7.0.patch +++ /dev/null @@ -1,31 +0,0 @@ -Hack to not use the pg_config of the host system which will add /usr/include - -pg_config is a native binary so using that when cross compiling -will always fail. The commented out fix would do, but for OE -our -platform and -xplatform is the same so we are actually not -really cross compiling. Just comment out the test, we are passing -the location to the postgres headers and if they are okay we -will pad. - -Original Author: Holger Hans Peter Freyther <zecke@selfish.org> -Upstream-Status: Inappropriate [configuration] - -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 |
