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:28 +0100 |
| commit | 95f348d81353ea105493d0cc360d63b6b7264ce5 (patch) | |
| tree | 6069abfd4bcb315220649ed9c7f3c87663c752d6 /meta/recipes-qt/qt4/files/hack-out-pg_config.patch | |
| parent | 6b407df32d50db19cb9c0492affabf14a8d6342b (diff) | |
| download | openembedded-core-95f348d81353ea105493d0cc360d63b6b7264ce5.tar.gz openembedded-core-95f348d81353ea105493d0cc360d63b6b7264ce5.tar.bz2 openembedded-core-95f348d81353ea105493d0cc360d63b6b7264ce5.zip | |
qt4: remove Qt 4.6.3
We should only have one version of Qt4 supported in oe-core.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
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 @@ -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 padd. - -Ported from OE by: Yu Ke <ke.yu@intel.com> - -Index: qt-embedded-linux-opensource-src-4.5.2/configure -=================================================================== ---- qt-embedded-linux-opensource-src-4.5.2.orig/configure 2009-08-10 03:03:04.000000000 +0200 -+++ qt-embedded-linux-opensource-src-4.5.2/configure 2009-08-10 03:58:11.000000000 +0200 -@@ -4401,10 +4402,10 @@ - ;; - psql) - if [ "$CFG_SQL_psql" != "no" ]; then -- if "$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 [ "$QT_CROSS_COMPILE" = "no" ] && "$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" - 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 |