| Message ID | 20220826135503.20612-19-jesseevg@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | Extend Qt6 configuration | expand |
Hello Jesse, On Fri, 26 Aug 2022 15:54:52 +0200 Jesse Van Gavere <jesseevg@gmail.com> wrote: > +if BR2_PACKAGE_QT6BASE_SQL > +config BR2_PACKAGE_QT6BASE_MYSQL > + bool "MySQL Plugin" > + depends on BR2_USE_MMU # mysql I have replicated all dependencies of mysql for the sake of completeness. > + select BR2_PACKAGE_MYSQL > + select BR2_PACKAGE_NCURSES > + select BR2_PACKAGE_READLINE ncurses and readline don't seem to be needed. They were not even build-time dependencies anyway, so I dropped these lines. > + help > + Build MySQL plugin > + If unsure, say n. The "If unsure, say n" is a bit useless, so I dropped it. Applied with those changes, thanks! Thomas
diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 25f848f7a7..9509fa5be9 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -60,6 +60,24 @@ config BR2_PACKAGE_QT6BASE_NETWORK help This options enables the Qt6Network library. +config BR2_PACKAGE_QT6BASE_SQL + bool "sql module" + help + This options enables the Qt6Sql library. + +if BR2_PACKAGE_QT6BASE_SQL +config BR2_PACKAGE_QT6BASE_MYSQL + bool "MySQL Plugin" + depends on BR2_USE_MMU # mysql + select BR2_PACKAGE_MYSQL + select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_READLINE + help + Build MySQL plugin + If unsure, say n. + +endif + config BR2_PACKAGE_QT6BASE_SYSLOG bool "syslog support" help diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index ffb03314ec..0061a69c63 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -103,6 +103,22 @@ else QT6BASE_CONF_OPTS += -DFEATURE_libudev=OFF endif +# Qt6 SQL Plugins +ifeq ($(BR2_PACKAGE_QT6BASE_SQL),y) +QT6BASE_CONF_OPTS += -DFEATURE_sql=ON +QT6BASE_CONF_OPTS += -DFEATURE_sql_db2=OFF -DFEATURE_sql_ibase=OFF -DFEATURE_sql_oci=OFF -DFEATURE_sql_odbc=OFF + +ifeq ($(BR2_PACKAGE_QT6BASE_MYSQL),y) +QT6BASE_CONF_OPTS += -DFEATURE_sql_mysql=ON +QT6BASE_DEPENDENCIES += mysql +else +QT6BASE_CONF_OPTS += -DFEATURE_sql_mysql=OFF +endif + +else +QT6BASE_CONF_OPTS += -DFEATURE_sql=OFF +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) QT6BASE_CONF_OPTS += -DINPUT_openssl=yes QT6BASE_DEPENDENCIES += openssl
Signed-off-by: Jesse Van Gavere <jesseevg@gmail.com> --- package/qt6/qt6base/Config.in | 18 ++++++++++++++++++ package/qt6/qt6base/qt6base.mk | 16 ++++++++++++++++ 2 files changed, 34 insertions(+)