Skip to contentSkip to conversation

qt: fix mysql dependency and disable unavailable sql drivers

PATCH New Peter Korsgaard 3 participants 3 messages Jul 16, 2010 – Jul 18, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 qt: fix mysql dependency and disable unavailable sql drivers

commit: http://git.buildroot.net/buildroot/commit/?id=470e9deec1a740d3cf87fdf7598524560632ce0b
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

We don't have the needed dependencies in BR for most of the SQL drivers, so mark those options as broken.

---
 package/qt/Config.sql.in |    7 +++++++
 package/qt/qt.mk         |    4 +++-
 2 files changed, 10 insertions(+), 1 deletions(-)
package/qt/Config.sql.in +7 -0
index 2ce8d79..b982fdb 100644
@@ -6,24 +6,30 @@ menuconfig BR2_PACKAGE_QT_SQL_MODULE
 if BR2_PACKAGE_QT_SQL_MODULE
 config BR2_PACKAGE_QT_MYSQL
 	bool "MySQL Driver"
+	select BR2_PACKAGE_MYSQL_CLIENT
+	select BR2_PACKAGE_NCURSES
+	select BR2_PACKAGE_READLINE
 	help
 	  Build MySQL driver
 	  If unsure, say n.
 
 config BR2_PACKAGE_QT_IBASE
 	bool "iBase Driver"
+	depends on BROKEN # libfbclient not in BR
 	help
 	  Build iBase driver
 	  If unsure, say n.
 
 config BR2_PACKAGE_QT_ODBC
 	bool "ODBC Driver"
+	depends on BROKEN # libodbc not in BR
 	help
 	  Build ODBC driver
 	  If unsure, say n.
 
 config BR2_PACKAGE_QT_PSQL
 	bool "PostgreSQL Driver"
+	depends on BROKEN # libpgsql not in BR
 	help
 	  Build PostgreSQL driver
 	  If unsure, say n.
@@ -36,6 +42,7 @@ config BR2_PACKAGE_QT_SQLITE
 
 config BR2_PACKAGE_QT_SQLITE2
 	bool "SQLite 2 Driver"
+	depends on BROKEN # sqlite2 not in BR
 	help
 	  Build SQLite 2 driver
 	  If unsure, say n.
package/qt/qt.mk +3 -1
index dd43ae0..864e79b 100644
@@ -273,7 +273,9 @@ ifeq ($(BR2_PACKAGE_QT_IBASE),y)
 QT_CONFIGURE+= -qt-sql-ibase
 endif
 ifeq ($(BR2_PACKAGE_QT_MYSQL),y)
-QT_CONFIGURE+= -qt-sql-mysql
+QT_CONFIGURE+= -qt-sql-mysql -I $(STAGING_DIR)/usr/include/mysql -L $(STAGING_DIR)/usr/lib/mysql
+
+QT_DEP_LIBS+=mysql_client
 endif
 ifeq ($(BR2_PACKAGE_QT_ODBC),y)
 QT_CONFIGURE+= -qt-sql-odbc
Signature · 1 line
1.7.1
#1 lore raw

PATCH 1/1 qt: fix mysql dependency and disable unavailable sql drivers

Hello,

Quoted 2 lines · On Fri, 16 Jul 2010 23:55:30 +0200 Peter Korsgaard <[email protected]> wrote:

We don't have the needed dependencies in BR for most of the SQL drivers, so mark those options as broken.

I had already sent a fix for the Qt->MySQL dependency on Friday, at 11:18 AM, together with a bump of the MySQL version (which allows MySQL to actually build here) and other fixes as well.

I will rebase my changes on top of yours and resend.

Thanks!

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#2 lore raw

PATCH 1/1 qt: fix mysql dependency and disable unavailable sql drivers

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> Hello,
Thomas> On Fri, 16 Jul 2010 23:55:30 +0200

Quoted 2 lines · Thomas> Peter Korsgaard <[email protected]> wrote:
Quoted 2 lines

We don't have the needed dependencies in BR for most of the SQL drivers, so mark those options as broken.

Thomas> I had already sent a fix for the Qt->MySQL dependency on Friday, at Thomas> 11:18 AM, together with a bump of the MySQL version (which allows MySQL Thomas> to actually build here) and other fixes as well.

Sorry, I'm ~250 mails behind on the BR list :/

The existing mysql version builds here, but a bump is find.

Thomas> I will rebase my changes on top of yours and resend.

Not needed - I committed everything besides the Qt patch.

Signature · 1 line
Bye, Peter Korsgaard