* [Buildroot] [PATCH] qt5: mysql and sqlite plugins
@ 2013-05-23 21:04 Wojciech Slenska
2013-05-27 19:05 ` Arnout Vandecappelle
0 siblings, 1 reply; 5+ messages in thread
From: Wojciech Slenska @ 2013-05-23 21:04 UTC (permalink / raw)
To: buildroot
Added support for mysql and sqlite plugins. Configuration is based on qt package.
Signed-off-by: Wojciech Slenska <wojciech.slenska@gmail.com>
---
package/qt5/qt5base/Config.in | 36 ++++++++++++++++++++++++++++++++++++
package/qt5/qt5base/qt5base.mk | 11 +++++++++++
2 files changed, 47 insertions(+)
diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in
index 7974357..9c7fd15 100644
--- a/package/qt5/qt5base/Config.in
+++ b/package/qt5/qt5base/Config.in
@@ -43,6 +43,42 @@ config BR2_PACKAGE_QT5BASE_SQL
help
This options enables the Qt5Sql library.
+if BR2_PACKAGE_QT5BASE_SQL
+config BR2_PACKAGE_QT5BASE_MYSQL
+ bool "MySQL Plugin"
+ select BR2_PACKAGE_MYSQL_CLIENT
+ select BR2_PACKAGE_NCURSES
+ select BR2_PACKAGE_READLINE
+ depends on BR2_USE_MMU # mysql
+ help
+ Build MySQL plugin
+ If unsure, say n.
+choice
+ prompt "SQLite 3 support"
+ default BR2_PACKAGE_QT5BASE_SQLITE_NONE
+ help
+ Select SQLite support.
+
+config BR2_PACKAGE_QT5BASE_SQLITE_NONE
+ bool "No sqlite support"
+ help
+ Do not compile any kind of SQLite support.
+
+config BR2_PACKAGE_QT5BASE_SQLITE_QT
+ bool "Qt SQLite"
+ help
+ Use Qt bundled SQLite support.
+
+config BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM
+ bool "System SQLite"
+ select BR2_PACKAGE_SQLITE
+ help
+ Use system SQLite.
+
+endchoice
+
+endif
+
config BR2_PACKAGE_QT5BASE_TEST
bool "test module"
help
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index bfc6c91..5b0596d 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -60,6 +60,17 @@ QT5BASE_LICENSE = Commercial license
QT5BASE_REDISTRIBUTE = NO
endif
+# Qt5 SQL Plugins
+ifeq ($(BR2_PACKAGE_QT5BASE_SQL),y)
+QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_MYSQL),-plugin-sql-mysql -mysql_config $(STAGING_DIR)/usr/bin/mysql_config,-no-sql-mysql)
+QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_MYSQL),mysql_client)
+
+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)
+QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_NONE),-no-sql-sqlite)
+endif
+
# We have to use --enable-linuxfb, otherwise Qt thinks that -linuxfb
# is to add a link against the "inuxfb" library.
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_GUI),-gui,-no-gui)
--
1.8.1.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH] qt5: mysql and sqlite plugins
2013-05-23 21:04 [Buildroot] [PATCH] qt5: mysql and sqlite plugins Wojciech Slenska
@ 2013-05-27 19:05 ` Arnout Vandecappelle
2013-05-28 8:20 ` Wojciech Sleńska
0 siblings, 1 reply; 5+ messages in thread
From: Arnout Vandecappelle @ 2013-05-27 19:05 UTC (permalink / raw)
To: buildroot
On 23/05/13 23:04, Wojciech Slenska wrote:
> Added support for mysql and sqlite plugins. Configuration is based on qt package.
>
> Signed-off-by: Wojciech Slenska <wojciech.slenska@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
(untested)
One minor comment below.
> ---
> package/qt5/qt5base/Config.in | 36 ++++++++++++++++++++++++++++++++++++
> package/qt5/qt5base/qt5base.mk | 11 +++++++++++
> 2 files changed, 47 insertions(+)
>
> diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in
> index 7974357..9c7fd15 100644
> --- a/package/qt5/qt5base/Config.in
> +++ b/package/qt5/qt5base/Config.in
> @@ -43,6 +43,42 @@ config BR2_PACKAGE_QT5BASE_SQL
> help
> This options enables the Qt5Sql library.
>
> +if BR2_PACKAGE_QT5BASE_SQL
> +config BR2_PACKAGE_QT5BASE_MYSQL
> + bool "MySQL Plugin"
> + select BR2_PACKAGE_MYSQL_CLIENT
> + select BR2_PACKAGE_NCURSES
> + select BR2_PACKAGE_READLINE
> + depends on BR2_USE_MMU # mysql
> + help
> + Build MySQL plugin
> + If unsure, say n.
> +choice
> + prompt "SQLite 3 support"
> + default BR2_PACKAGE_QT5BASE_SQLITE_NONE
> + help
> + Select SQLite support.
> +
> +config BR2_PACKAGE_QT5BASE_SQLITE_NONE
> + bool "No sqlite support"
> + help
> + Do not compile any kind of SQLite support.
> +
> +config BR2_PACKAGE_QT5BASE_SQLITE_QT
> + bool "Qt SQLite"
> + help
> + Use Qt bundled SQLite support.
> +
> +config BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM
> + bool "System SQLite"
> + select BR2_PACKAGE_SQLITE
> + help
> + Use system SQLite.
> +
> +endchoice
> +
> +endif
> +
> config BR2_PACKAGE_QT5BASE_TEST
> bool "test module"
> help
> diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
> index bfc6c91..5b0596d 100644
> --- a/package/qt5/qt5base/qt5base.mk
> +++ b/package/qt5/qt5base/qt5base.mk
> @@ -60,6 +60,17 @@ QT5BASE_LICENSE = Commercial license
> QT5BASE_REDISTRIBUTE = NO
> endif
>
> +# Qt5 SQL Plugins
> +ifeq ($(BR2_PACKAGE_QT5BASE_SQL),y)
> +QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_MYSQL),-plugin-sql-mysql -mysql_config $(STAGING_DIR)/usr/bin/mysql_config,-no-sql-mysql)
Please split this long line. Actually, an ifeq - else construct seems
more appropriate in this case.
Regards,
Arnout
> +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_MYSQL),mysql_client)
> +
> +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)
> +QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_NONE),-no-sql-sqlite)
> +endif
> +
> # We have to use --enable-linuxfb, otherwise Qt thinks that -linuxfb
> # is to add a link against the "inuxfb" library.
> QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_GUI),-gui,-no-gui)
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH] qt5: mysql and sqlite plugins
2013-05-27 19:05 ` Arnout Vandecappelle
@ 2013-05-28 8:20 ` Wojciech Sleńska
2013-05-28 19:05 ` [Buildroot] [PATCH v2] " Wojciech Slenska
0 siblings, 1 reply; 5+ messages in thread
From: Wojciech Sleńska @ 2013-05-28 8:20 UTC (permalink / raw)
To: buildroot
Hello Arnout,
Thanks for Your comment. I will change this long line to if - else construction.
Best Regards
Wojciech
2013/5/27 Arnout Vandecappelle <arnout@mind.be>:
> On 23/05/13 23:04, Wojciech Slenska wrote:
>>
>> Added support for mysql and sqlite plugins. Configuration is based on qt
>> package.
>>
>> Signed-off-by: Wojciech Slenska <wojciech.slenska@gmail.com>
>
>
> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> (untested)
>
> One minor comment below.
>
>
>> ---
>> package/qt5/qt5base/Config.in | 36 ++++++++++++++++++++++++++++++++++++
>> package/qt5/qt5base/qt5base.mk | 11 +++++++++++
>> 2 files changed, 47 insertions(+)
>>
>> diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in
>> index 7974357..9c7fd15 100644
>> --- a/package/qt5/qt5base/Config.in
>> +++ b/package/qt5/qt5base/Config.in
>> @@ -43,6 +43,42 @@ config BR2_PACKAGE_QT5BASE_SQL
>> help
>> This options enables the Qt5Sql library.
>>
>> +if BR2_PACKAGE_QT5BASE_SQL
>> +config BR2_PACKAGE_QT5BASE_MYSQL
>> + bool "MySQL Plugin"
>> + select BR2_PACKAGE_MYSQL_CLIENT
>> + select BR2_PACKAGE_NCURSES
>> + select BR2_PACKAGE_READLINE
>> + depends on BR2_USE_MMU # mysql
>> + help
>> + Build MySQL plugin
>> + If unsure, say n.
>> +choice
>> + prompt "SQLite 3 support"
>> + default BR2_PACKAGE_QT5BASE_SQLITE_NONE
>> + help
>> + Select SQLite support.
>> +
>> +config BR2_PACKAGE_QT5BASE_SQLITE_NONE
>> + bool "No sqlite support"
>> + help
>> + Do not compile any kind of SQLite support.
>> +
>> +config BR2_PACKAGE_QT5BASE_SQLITE_QT
>> + bool "Qt SQLite"
>> + help
>> + Use Qt bundled SQLite support.
>> +
>> +config BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM
>> + bool "System SQLite"
>> + select BR2_PACKAGE_SQLITE
>> + help
>> + Use system SQLite.
>> +
>> +endchoice
>> +
>> +endif
>> +
>> config BR2_PACKAGE_QT5BASE_TEST
>> bool "test module"
>> help
>> diff --git a/package/qt5/qt5base/qt5base.mk
>> b/package/qt5/qt5base/qt5base.mk
>> index bfc6c91..5b0596d 100644
>> --- a/package/qt5/qt5base/qt5base.mk
>> +++ b/package/qt5/qt5base/qt5base.mk
>> @@ -60,6 +60,17 @@ QT5BASE_LICENSE = Commercial license
>> QT5BASE_REDISTRIBUTE = NO
>> endif
>>
>> +# Qt5 SQL Plugins
>> +ifeq ($(BR2_PACKAGE_QT5BASE_SQL),y)
>> +QT5BASE_CONFIGURE_OPTS += $(if
>> $(BR2_PACKAGE_QT5BASE_MYSQL),-plugin-sql-mysql -mysql_config
>> $(STAGING_DIR)/usr/bin/mysql_config,-no-sql-mysql)
>
>
> Please split this long line. Actually, an ifeq - else construct seems more
> appropriate in this case.
>
> Regards,
> Arnout
>
>
>> +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_MYSQL),mysql_client)
>> +
>> +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)
>> +QT5BASE_CONFIGURE_OPTS += $(if
>> $(BR2_PACKAGE_QT5BASE_SQLITE_NONE),-no-sql-sqlite)
>> +endif
>> +
>> # We have to use --enable-linuxfb, otherwise Qt thinks that -linuxfb
>> # is to add a link against the "inuxfb" library.
>> QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_GUI),-gui,-no-gui)
>>
>
>
> --
> Arnout Vandecappelle arnout at mind be
> Senior Embedded Software Architect +32-16-286500
> Essensium/Mind http://www.mind.be
> G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
> LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
> GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v2] qt5: mysql and sqlite plugins
2013-05-28 8:20 ` Wojciech Sleńska
@ 2013-05-28 19:05 ` Wojciech Slenska
2013-05-30 21:48 ` Peter Korsgaard
0 siblings, 1 reply; 5+ messages in thread
From: Wojciech Slenska @ 2013-05-28 19:05 UTC (permalink / raw)
To: buildroot
Added support for mysql and sqlite plugins. Configuration is based on qt package.
Signed-off-by: Wojciech Slenska <wojciech.slenska@gmail.com>
---
package/qt5/qt5base/Config.in | 36 ++++++++++++++++++++++++++++++++++++
package/qt5/qt5base/qt5base.mk | 15 +++++++++++++++
2 files changed, 51 insertions(+)
diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in
index 7974357..9c7fd15 100644
--- a/package/qt5/qt5base/Config.in
+++ b/package/qt5/qt5base/Config.in
@@ -43,6 +43,42 @@ config BR2_PACKAGE_QT5BASE_SQL
help
This options enables the Qt5Sql library.
+if BR2_PACKAGE_QT5BASE_SQL
+config BR2_PACKAGE_QT5BASE_MYSQL
+ bool "MySQL Plugin"
+ select BR2_PACKAGE_MYSQL_CLIENT
+ select BR2_PACKAGE_NCURSES
+ select BR2_PACKAGE_READLINE
+ depends on BR2_USE_MMU # mysql
+ help
+ Build MySQL plugin
+ If unsure, say n.
+choice
+ prompt "SQLite 3 support"
+ default BR2_PACKAGE_QT5BASE_SQLITE_NONE
+ help
+ Select SQLite support.
+
+config BR2_PACKAGE_QT5BASE_SQLITE_NONE
+ bool "No sqlite support"
+ help
+ Do not compile any kind of SQLite support.
+
+config BR2_PACKAGE_QT5BASE_SQLITE_QT
+ bool "Qt SQLite"
+ help
+ Use Qt bundled SQLite support.
+
+config BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM
+ bool "System SQLite"
+ select BR2_PACKAGE_SQLITE
+ help
+ Use system SQLite.
+
+endchoice
+
+endif
+
config BR2_PACKAGE_QT5BASE_TEST
bool "test module"
help
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index bfc6c91..1eea2e7 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -60,6 +60,21 @@ QT5BASE_LICENSE = Commercial license
QT5BASE_REDISTRIBUTE = NO
endif
+# Qt5 SQL Plugins
+ifeq ($(BR2_PACKAGE_QT5BASE_SQL),y)
+ifeq ($(BR2_PACKAGE_QT5BASE_MYSQL),y)
+QT5BASE_CONFIGURE_OPTS += -plugin-sql-mysql -mysql_config $(STAGING_DIR)/usr/bin/mysql_config
+QT5BASE_DEPENDENCIES += mysql_client
+else
+QT5BASE_CONFIGURE_OPTS += -no-sql-mysql
+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)
+QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_NONE),-no-sql-sqlite)
+endif
+
# We have to use --enable-linuxfb, otherwise Qt thinks that -linuxfb
# is to add a link against the "inuxfb" library.
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_GUI),-gui,-no-gui)
--
1.8.1.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v2] qt5: mysql and sqlite plugins
2013-05-28 19:05 ` [Buildroot] [PATCH v2] " Wojciech Slenska
@ 2013-05-30 21:48 ` Peter Korsgaard
0 siblings, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2013-05-30 21:48 UTC (permalink / raw)
To: buildroot
>>>>> "Wojciech" == Wojciech Slenska <wojciech.slenska@gmail.com> writes:
Wojciech> Added support for mysql and sqlite plugins. Configuration is
Wojciech> based on qt package.
Committed to next, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-05-30 21:48 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-23 21:04 [Buildroot] [PATCH] qt5: mysql and sqlite plugins Wojciech Slenska
2013-05-27 19:05 ` Arnout Vandecappelle
2013-05-28 8:20 ` Wojciech Sleńska
2013-05-28 19:05 ` [Buildroot] [PATCH v2] " Wojciech Slenska
2013-05-30 21:48 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox