diff options
Diffstat (limited to 'meta-oe/recipes-qt/qt4/files/hack-out-pg_config.patch')
| -rw-r--r-- | meta-oe/recipes-qt/qt4/files/hack-out-pg_config.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/meta-oe/recipes-qt/qt4/files/hack-out-pg_config.patch b/meta-oe/recipes-qt/qt4/files/hack-out-pg_config.patch deleted file mode 100644 index 650ed7745e..0000000000 --- a/meta-oe/recipes-qt/qt4/files/hack-out-pg_config.patch +++ /dev/null | |||
| @@ -1,30 +0,0 @@ | |||
| 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 padd. | ||
| 9 | |||
| 10 | Ported from OE by: Yu Ke <ke.yu@intel.com> | ||
| 11 | |||
| 12 | Index: qt-embedded-linux-opensource-src-4.5.2/configure | ||
| 13 | =================================================================== | ||
| 14 | --- qt-embedded-linux-opensource-src-4.5.2.orig/configure 2009-08-10 03:03:04.000000000 +0200 | ||
| 15 | +++ qt-embedded-linux-opensource-src-4.5.2/configure 2009-08-10 03:58:11.000000000 +0200 | ||
| 16 | @@ -4401,10 +4402,10 @@ | ||
| 17 | ;; | ||
| 18 | psql) | ||
| 19 | if [ "$CFG_SQL_psql" != "no" ]; then | ||
| 20 | - if "$WHICH" pg_config >/dev/null 2>&1; then | ||
| 21 | - QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null` | ||
| 22 | - QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null` | ||
| 23 | - fi | ||
| 24 | +# if [ "$QT_CROSS_COMPILE" = "no" ] && "$WHICH" pg_config >/dev/null 2>&1; then | ||
| 25 | +# QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null` | ||
| 26 | +# QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null` | ||
| 27 | +# fi | ||
| 28 | [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL" | ||
| 29 | [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL" | ||
| 30 | if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/psql "PostgreSQL" $QT_LFLAGS_PSQL $L_FLAGS $QT_CFLAGS_PSQL $I_FLAGS $l_FLAGS $MAC_ARCHS_COMMANDLINE; then | ||
