diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2014-09-01 15:22:07 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-09-01 15:22:07 +0200 |
| commit | 5aedb8be688d47526101bdb3e58598df588326e6 (patch) | |
| tree | ae348b9262fdaf123b3b152e65b6116b5ef36cb4 /package/qt5/qt5base | |
| parent | 7f0ce7c8780569afa33b68c9c024bf4072e29a99 (diff) | |
| parent | 62387a8b11224a9c5320d42e2f0c4e2089d3452b (diff) | |
| download | buildroot-5aedb8be688d47526101bdb3e58598df588326e6.tar.gz buildroot-5aedb8be688d47526101bdb3e58598df588326e6.zip | |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/qt5/qt5base')
| -rw-r--r-- | package/qt5/qt5base/Config.in | 12 | ||||
| -rw-r--r-- | package/qt5/qt5base/qt5base.mk | 9 |
2 files changed, 21 insertions, 0 deletions
diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in index 7a34d6f206..f4eedec1fd 100644 --- a/package/qt5/qt5base/Config.in +++ b/package/qt5/qt5base/Config.in @@ -62,6 +62,18 @@ config BR2_PACKAGE_QT5BASE_MYSQL help Build MySQL plugin If unsure, say n. + +config BR2_PACKAGE_QT5BASE_PSQL + bool "PostgreSQL Plugin" + select BR2_PACKAGE_POSTGRESQL + depends on BR2_TOOLCHAIN_USES_GLIBC + help + Build PostgreSQL plugin + 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_QT5BASE_SQLITE_NONE diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 712208f6fa..88e86c4662 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -66,6 +66,14 @@ else QT5BASE_CONFIGURE_OPTS += -no-sql-mysql endif +ifeq ($(BR2_PACKAGE_QT5BASE_PSQL),y) +QT5BASE_CONFIGURE_OPTS += -plugin-sql-psql +QT5BASE_CONFIGURE_ENV += PSQL_LIBS=-L$(STAGING_DIR)/usr/lib +QT5BASE_DEPENDENCIES += postgresql +else +QT5BASE_CONFIGURE_OPTS += -no-sql-psql +endif + QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_QT),-plugin-sql-sqlite) QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM),-system-sqlite) QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM),sqlite) @@ -170,6 +178,7 @@ define QT5BASE_CONFIGURE_CMDS PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig" \ PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \ MAKEFLAGS="$(MAKEFLAGS) -j$(PARALLEL_JOBS)" \ + $(QT5BASE_CONFIGURE_ENV) \ ./configure \ -v \ -prefix /usr \ |
