diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-05-17 11:53:22 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-18 14:32:47 +0100 |
commit | 0f574ccf07fd35fb3a8a9ddf01b5fd1ce6865cad (patch) | |
tree | 07358c94e34a81ed31fbe5701512f687ece3d98a /meta/recipes-qt/qt4/files/hack-out-pg_config.patch | |
parent | 000368f1e78ad0dd68ebbf7e3d4135ca6bfad777 (diff) | |
download | poky-0f574ccf07fd35fb3a8a9ddf01b5fd1ce6865cad.tar.gz |
qt4: remove Qt 4.6.3
We should only have one version of Qt4 supported in oe-core.
(From OE-Core rev: 95f348d81353ea105493d0cc360d63b6b7264ce5)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/files/hack-out-pg_config.patch')
-rw-r--r-- | meta/recipes-qt/qt4/files/hack-out-pg_config.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/meta/recipes-qt/qt4/files/hack-out-pg_config.patch b/meta/recipes-qt/qt4/files/hack-out-pg_config.patch deleted file mode 100644 index 650ed7745e..0000000000 --- a/meta/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 | ||