Skip to contentSkip to conversation

package/unixodbc: new package

PATCH Superseded Bernd Kuhls 3 participants 9 messages Mar 6, 2015 – Apr 5, 2015

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH v2 1/4 package/unixodbc: new package

Signed-off-by Bernd Kuhls <[email protected]>

---
v2: various changes suggested by Thomas
- added license stuff
- added --disable- options, removed indentions
- removed UNIXODBC_REMOVE_TARGET_BINS_FROM_STAGING originally needed by apr-util because its configure script tries to call bin/odbc_config from staging dir which fails because this file is compiled for target. A fix was added to the apr-util package.

 package/Config.in              |    1 +
 package/unixodbc/Config.in     |    7 +++++++
 package/unixodbc/unixodbc.hash |    2 ++
 package/unixodbc/unixodbc.mk   |   30 ++++++++++++++++++++++++++++++
 4 files changed, 40 insertions(+)
 create mode 100644 package/unixodbc/Config.in
 create mode 100644 package/unixodbc/unixodbc.hash
 create mode 100644 package/unixodbc/unixodbc.mk
package/Config.in +1 -0
index 584887b..03edca9 100644
@@ -672,6 +672,7 @@ menu "Database"
 	source "package/redis/Config.in"
 	source "package/sqlcipher/Config.in"
 	source "package/sqlite/Config.in"
+	source "package/unixodbc/Config.in"
 endmenu
 
 menu "Filesystem"
package/unixodbc/Config.in new file +7 -0
new file mode 100644
index 0000000..c23e0a5
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_UNIXODBC
+	bool "unixodbc"
+	help
+	  The unixODBC Project goals are to develop and promote unixODBC
+	  to be the definitive standard for ODBC on non MS Windows platforms.
+
+	  http://www.unixodbc.org
package/unixodbc/unixodbc.hash new file +2 -0
new file mode 100644
index 0000000..a5c2d11
@@ -0,0 +1,2 @@
+# From ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-2.3.2.tar.gz.md5
+md5	5e4528851eda5d3d4aed249b669bd05b	unixODBC-2.3.2.tar.gz
package/unixodbc/unixodbc.mk new file +30 -0
new file mode 100644
index 0000000..067c1ca
@@ -0,0 +1,30 @@
+################################################################################
+#
+# unixodbc
+#
+################################################################################
+
+UNIXODBC_VERSION = 2.3.2
+UNIXODBC_SOURCE = unixODBC-$(UNIXODBC_VERSION).tar.gz
+UNIXODBC_SITE = ftp://ftp.unixodbc.org/pub/unixODBC
+UNIXODBC_INSTALL_STAGING = YES
+UNIXODBC_LICENSE = LGPLv2.1+ (library), GPLv2+ (programs)
+UNIXODBC_LICENSE_FILES = COPYING exe/COPYING
+
+UNIXODBC_CONF_OPTS = --enable-drivers --enable-driver-conf
+
+ifeq ($(BR2_PACKAGE_LIBICONV),y)
+UNIXODBC_CONF_OPTS += --enable-iconv
+UNIXODBC_DEPENDENCIES += libiconv
+else
+UNIXODBC_CONF_OPTS += --disable-iconv
+endif
+
+ifeq ($(BR2_PACKAGE_READLINE),y)
+UNIXODBC_CONF_OPTS += --enable-readline
+UNIXODBC_DEPENDENCIES += readline
+else
+UNIXODBC_CONF_OPTS += --disable-readline
+endif
+
+$(eval $(autotools-package))
Signature · 1 line
1.7.10.4
author
#1 lore raw

PATCH v2 2/4 package/qt: enable unixodbc support

Signed-off-by Bernd Kuhls <[email protected]>

---
v2: no changes

 package/qt/Config.sql.in |    2 +-
 package/qt/qt.mk         |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
package/qt/Config.sql.in +1 -1
index fd62657..81337a1 100644
@@ -23,7 +23,7 @@ config BR2_PACKAGE_QT_IBASE
 
 config BR2_PACKAGE_QT_ODBC
 	bool "ODBC Driver"
-	depends on BROKEN # libodbc not in BR
+	select BR2_PACKAGE_UNIXODBC
 	help
 	  Build ODBC driver
 	  If unsure, say n.
package/qt/qt.mk +1 -0
index 3fb557f..1612f5d 100644
@@ -359,6 +359,7 @@ QT_DEPENDENCIES += mysql
 endif
 ifeq ($(BR2_PACKAGE_QT_ODBC),y)
 QT_CONFIGURE_OPTS += -qt-sql-odbc
+QT_DEPENDENCIES += unixodbc
 endif
 ifeq ($(BR2_PACKAGE_QT_PSQL),y)
 QT_CONFIGURE_OPTS += -qt-sql-psql
Signature · 1 line
1.7.10.4
Applied
#2 lore raw

PATCH v2 2/4 package/qt: enable unixodbc support

Dear Bernd Kuhls,

Quoted 4 lines · Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>

---
v2: no changes

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#3 lore raw

PATCH v2 3/4 package/php: add unixodbc support

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>

---
v2: no changes

 package/php/Config.ext |    6 ++++++
 package/php/php.mk     |    4 ++++
 2 files changed, 10 insertions(+)
package/php/Config.ext +6 -0
index daf16c7..c4181fd 100644
@@ -156,6 +156,12 @@ config BR2_PACKAGE_PHP_EXT_PDO_SQLITE
 	help
 	  SQLite3 driver for PDO
 
+config BR2_PACKAGE_PHP_EXT_PDO_UNIXODBC
+	bool "unixODBC"
+	select BR2_PACKAGE_UNIXODBC
+	help
+	  unixODBC driver for PDO
+
 endif
 
 comment "Human language and character encoding support"
package/php/php.mk +4 -0
index dd52508..054fdc7 100644
@@ -174,6 +174,10 @@ ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_POSTGRESQL),y)
 	PHP_CONF_OPTS += --with-pdo-pgsql=$(STAGING_DIR)/usr
 	PHP_DEPENDENCIES += postgresql
 endif
+ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_UNIXODBC),y)
+	PHP_CONF_OPTS += --with-pdo-odbc=unixODBC,$(STAGING_DIR)/usr
+	PHP_DEPENDENCIES += unixodbc
+endif
 endif
 
 ### Use external PCRE if it's available
Signature · 1 line
1.7.10.4
Applied
#4 lore raw

PATCH v2 3/4 package/php: add unixodbc support

Dear Bernd Kuhls,

Quoted 8 lines · Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>

---
v2: no changes

 package/php/Config.ext |    6 ++++++
 package/php/php.mk     |    4 ++++
 2 files changed, 10 insertions(+)

Applied, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#5 lore raw

PATCH v2 4/4 package/apr-util: add support for unixodbc

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>

---
v2: avoid picking up $(STAGING_DIR)/usr/bin/odbc_config, this file is
compiled for target and breaks unixodbc detection when used

 package/apr-util/apr-util.mk |    9 +++++++++
 1 file changed, 9 insertions(+)
package/apr-util/apr-util.mk +9 -0
index 3b0a71b..bc0572e 100644
@@ -53,4 +53,13 @@ else
 APR_UTIL_CONF_OPTS += --without-crypto
 endif
 
+ifeq ($(BR2_PACKAGE_UNIXODBC),y)
+APR_UTIL_CONF_OPTS += --with-odbc="$(STAGING_DIR)/usr"
+# avoid using target binary $(STAGING_DIR)/usr/bin/odbc_config
+APR_UTIL_CONF_ENV += ac_cv_path_ODBC_CONFIG=""
+APR_UTIL_DEPENDENCIES += unixodbc
+else
+APR_UTIL_CONF_OPTS += --without-odbc
+endif
+
 $(eval $(autotools-package))
Signature · 1 line
1.7.10.4
Applied
#6 lore raw

PATCH v2 4/4 package/apr-util: add support for unixodbc

Dear Bernd Kuhls,

Quoted 5 lines · Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>

---
v2: avoid picking up $(STAGING_DIR)/usr/bin/odbc_config, this file is
compiled for target and breaks unixodbc detection when used

Applied, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#7 lore raw

PATCH v2 1/4 package/unixodbc: new package

In reply to Bernd Kuhls

package/unixodbc/Config.in line 7

Quoted 10 lines · Bernd Kuhls
package/unixodbc/Config.in new file +7 -0
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_UNIXODBC
+	bool "unixodbc"
+	help
+	  The unixODBC Project goals are to develop and promote unixODBC
+	  to be the definitive standard for ODBC on non MS Windows platforms.
+
+	  http://www.unixodbc.org

Hi.
According to my tests it needs threads, you'll need to propagate that dependency upwards to php-pdo-unixdobc as well.
Other than that it looks good.
Regards.