[ptxdist] [PATCH] qt5: add choice for SQL backend

[ptxdist] [PATCH] qt5: add choice for SQL backend

[Bastian Stender]

MariaDB is a binary drop in replacement for MySQL and satisfies the
dependency. So make this a choice field.

Signed-off-by: Bastian Stender <bst@pengutronix.de>
---

This patch depends on the mariadb package.

 rules/qt5.in   | 17 ++++++++++++++++-
 rules/qt5.make |  4 ++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/rules/qt5.in b/rules/qt5.in
index caa41cc44..3bd6f494a 100644
--- a/rules/qt5.in
+++ b/rules/qt5.in
@@ -27,6 +27,7 @@ menuconfig QT5
 	select PLATFORM_OPENGL		if QT5_OPENGL_ES2
 	select SQLITE			if QT5_MODULE_QTBASE_SQL_SQLITE
 	select MYSQL			if QT5_MODULE_QTBASE_SQL_MYSQL
+	select MARIADB			if QT5_MODULE_QTBASE_SQL_MARIADB
 	select FONTCONFIG		if QT5_GUI
 	select FREETYPE			if QT5_GUI
 	select UDEV			if QT5_GUI || QT5_INPUT_LIBINPUT
@@ -325,9 +326,23 @@ config QT5_MODULE_QTBASE_SQL_SQLITE
 	bool
 	prompt "SQLite backend"
 
+choice
+	prompt "SQL backend"
+	default QT5_MODULE_QTBASE_SQL_NONE
+
+config QT5_MODULE_QTBASE_SQL_NONE
+	bool
+	prompt "none"
+
 config QT5_MODULE_QTBASE_SQL_MYSQL
 	bool
-	prompt "mySQL backend"
+	prompt "MySQL backend"
+
+config QT5_MODULE_QTBASE_SQL_MARIADB
+	bool
+	prompt "MariaDB backend"
+
+endchoice	# SQL backend
 
 endif
 
diff --git a/rules/qt5.make b/rules/qt5.make
index 3591e6131..806f30bf5 100644
--- a/rules/qt5.make
+++ b/rules/qt5.make
@@ -109,7 +109,7 @@ QT5_CONF_OPT	:= \
 	--$(call ptx/endis, PTXCONF_QT5_ACCESSIBILITY)-accessibility \
 	--disable-sql-db2 \
 	--disable-sql-ibase \
-	--$(call ptx/endis, PTXCONF_QT5_MODULE_QTBASE_SQL_MYSQL)-sql-mysql \
+	--$(call ptx/disen, PTXCONF_QT5_MODULE_QTBASE_SQL_NONE)-sql-mysql \
 	--disable-sql-oci \
 	--disable-sql-odbc \
 	--disable-sql-psql \
@@ -222,7 +222,7 @@ QT5_CONF_OPT += \
 	--$(call ptx/endis, PTXCONF_QT5_XRENDER)-xrender \
 	--$(call ptx/endis, PTXCONF_QT5_XV)-xvideo \
 
-ifdef PTXCONF_QT5_MODULE_QTBASE_SQL_MYSQL
+ifneq ("$(or $(PTXCONF_QT5_MODULE_QTBASE_SQL_MYSQL),$(PTXCONF_QT5_MODULE_QTBASE_SQL_MARIADB))", "")
 QT5_CONF_OPT += -mysql_config $(SYSROOT)/usr/bin/mysql_config
 endif
 
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de