diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2012-09-26 20:00:58 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-02 17:19:26 +0100 |
| commit | a0a29221c8df7c277139b0c875330f08cb2bdea3 (patch) | |
| tree | 967c8777a198f33333e458ca8579fe896c784e99 /meta/recipes-qt/qt4/qt4-4.8.1/hack-out-pg2-4.7.0.patch | |
| parent | 248e9f48c77212372b50074f0a475a16bb8db4be (diff) | |
| download | poky-a0a29221c8df7c277139b0c875330f08cb2bdea3.tar.gz | |
qt4: rename qt-4.8.1 to qt4-4.8.1 to match other .inc and .bb
(From OE-Core rev: dcda03d3f6ec442740e3683a1971103dc639689d)
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, 31 insertions, 0 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 new file mode 100644 index 0000000000..39c5f4a32c --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.1/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 | ||