From: Bastian Stender <bst@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Bastian Stender <bst@pengutronix.de>
Subject: [ptxdist] [PATCH] qt5: add choice for SQL backend
Date: Mon, 29 May 2017 14:22:48 +0200 [thread overview]
Message-ID: <20170529122248.2926-1-bst@pengutronix.de> (raw)
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
reply other threads:[~2017-05-29 12:22 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170529122248.2926-1-bst@pengutronix.de \
--to=bst@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox