mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-01-06 09:15:45 +01:00
1ec312f314
This gives us both qt4-x11 and qt4-embedded; qt4-x11 was already present in yocto, but was lacking features Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
31 lines
1.7 KiB
Diff
31 lines
1.7 KiB
Diff
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.
|
|
|
|
|
|
|
|
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
|