1 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.7.4/hack-out-pg2-4.7.0.patch b/meta/recipes-qt/qt4/qt-4.7.4/hack-out-pg2-4.7.0.patch
new file mode 100644
index 0000000000..39c5f4a32c
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-4.7.4/hack-out-pg2-4.7.0.patch
@@ -0,0 +1,31 @@
+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

diff --git a/meta/recipes-qt/qt4/qt-4.7.4/hack-out-pg2-4.7.0.patch b/meta/recipes-qt/qt4/qt-4.7.4/hack-out-pg2-4.7.0.patch new file mode 100644 index 0000000000..39c5f4a32c --- /dev/null +++ b/meta/recipes-qt/qt4/qt-4.7.4/hack-out-pg2-4.7.0.patch
@@ -0,0 +1,31 @@
	1	Hack to not use the pg_config of the host system which will add /usr/include
	2
	3	pg_config is a native binary so using that when cross compiling
	4	will always fail. The commented out fix would do, but for OE
	5	our -platform and -xplatform is the same so we are actually not
	6	really cross compiling. Just comment out the test, we are passing
	7	the location to the postgres headers and if they are okay we
	8	will pad.
	9
	10	Original Author: Holger Hans Peter Freyther <zecke@selfish.org>
	11	Upstream-Status: Inappropriate [configuration]
	12
	13	Index: qt-everywhere-opensource-src-4.7.0/configure
	14	===================================================================
	15	--- qt-everywhere-opensource-src-4.7.0.orig/configure 2010-09-22 15:43:51.191162141 -0400
	16	+++ qt-everywhere-opensource-src-4.7.0/configure 2010-09-22 15:44:35.179981232 -0400
	17	@@ -4921,10 +4921,10 @@
	18	psql)
	19	if [ "$CFG_SQL_psql" != "no" ]; then
	20	# Be careful not to use native pg_config when cross building.
	21	- if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then
	22	- QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
	23	- QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
	24	- fi
	25	+# if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then
	26	+# QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
	27	+# QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
	28	+# fi
	29	[ -z "$QT_CFLAGS_PSQL" ] \|\| QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
	30	[ -z "$QT_LFLAGS_PSQL" ] \|\| QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
	31	# But, respect PSQL_LIBS if set