From 5c46aabad7aa7feec88201e9aeef836fe1297189 Mon Sep 17 00:00:00 2001 From: Floris Bos Date: Wed, 13 Aug 2014 16:05:42 +0200 Subject: [PATCH] qt: add postgresql driver support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Floris Bos Reviewed-by: Fatih Aşıcı Signed-off-by: Peter Korsgaard --- package/qt/Config.sql.in | 6 +++++- package/qt/qt.mk | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/package/qt/Config.sql.in b/package/qt/Config.sql.in index 259a574621..fd62657f00 100644 --- a/package/qt/Config.sql.in +++ b/package/qt/Config.sql.in @@ -30,11 +30,15 @@ config BR2_PACKAGE_QT_ODBC config BR2_PACKAGE_QT_PSQL bool "PostgreSQL Driver" - depends on BROKEN # libpgsql not in BR + select BR2_PACKAGE_POSTGRESQL + depends on BR2_TOOLCHAIN_USES_GLIBC help Build PostgreSQL driver If unsure, say n. +comment "PostgreSQL needs an (e)glibc toolchain" + depends on !BR2_TOOLCHAIN_USES_GLIBC + choice prompt "SQLite 3 support" default BR2_PACKAGE_QT_SQLITE_NONE diff --git a/package/qt/qt.mk b/package/qt/qt.mk index 880e835a22..92a090f67f 100644 --- a/package/qt/qt.mk +++ b/package/qt/qt.mk @@ -343,6 +343,8 @@ QT_CONFIGURE_OPTS += -qt-sql-odbc endif ifeq ($(BR2_PACKAGE_QT_PSQL),y) QT_CONFIGURE_OPTS += -qt-sql-psql +QT_CONFIGURE_ENV += PSQL_LIBS=-L$(STAGING_DIR)/usr/lib +QT_DEPENDENCIES += postgresql endif ifeq ($(BR2_PACKAGE_QT_SQLITE_QT),y) QT_CONFIGURE_OPTS += -qt-sql-sqlite @@ -503,6 +505,7 @@ define QT_CONFIGURE_CMDS PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \ + $(QT_CONFIGURE_ENV) \ MAKEFLAGS="$(MAKEFLAGS) -j$(PARALLEL_JOBS)" ./configure \ $(if $(VERBOSE),-verbose,-silent) \ -force-pkg-config \