aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/qt4/qt-4.7.0
diff options
context:
space:
mode:
authorCliff Brake <cbrake@bec-systems.com>2010-09-23 10:33:31 -0400
committerCliff Brake <cbrake@bec-systems.com>2010-09-23 10:34:32 -0400
commit1d4dbbdb95e6eadcb29d20f4a6ef94cf4d9e5890 (patch)
tree98abc34b5a73c9abf79867270dd9689b7ee23be9 /recipes/qt4/qt-4.7.0
parent42c2e2efdfaf8cfd21cfc17005b23c74f6a8459b (diff)
downloadopenembedded-1d4dbbdb95e6eadcb29d20f4a6ef94cf4d9e5890.tar.gz
qt4 4.7.0: move pg patch to proper location
Diffstat (limited to 'recipes/qt4/qt-4.7.0')
-rw-r--r--recipes/qt4/qt-4.7.0/hack-out-pg2-4.7.0.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/recipes/qt4/qt-4.7.0/hack-out-pg2-4.7.0.patch b/recipes/qt4/qt-4.7.0/hack-out-pg2-4.7.0.patch
new file mode 100644
index 0000000000..5c588ff0f7
--- /dev/null
+++ b/recipes/qt4/qt-4.7.0/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