bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libdbi-drivers: update libdbi-drivers to 0.9.0

Browse Source 
Signed-off-by: Gerald Matzka <mgerald21@yahoo.de>
[Fix incdir and libdir]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>


git-svn-id: svn://svn.openwrt.org/openwrt/packages@40603 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
hauke 2014-04-29 22:00:17 +00:00
parent 75afd389eb
commit a517973086
3 changed files with 28 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libs/libdbi-drivers/Makefile
View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libdbi-drivers
PKG_VERSION:=0.8.3-1
PKG_RELEASE:=2
PKG_VERSION:=0.9.0
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/libdbi-drivers
PKG_MD5SUM:=4de79b323162a5a7652b65b608eca6cd
PKG_MD5SUM:=9f47b960e225eede2cdeaabf7d22f59f
PKG_FIXUP:=autoreconf
@ -33,7 +33,7 @@ endef
define Package/libdbi-drivers-mysql
$(call Package/libdbi-drivers/default)
DEPENDS:=libdbi +libmysqlclient
DEPENDS:=libdbi +PACKAGE_libdbi-drivers-mysql:libmysqlclient
TITLE:= libdbi-drivers-mysql
endef
@ -43,7 +43,7 @@ endef
define Package/libdbi-drivers-pgsql
$(call Package/libdbi-drivers/default)
DEPENDS:=libdbi +libpq
DEPENDS:=libdbi +PACKAGE_libdbi-drivers-pgsql:libpq
TITLE:= libdbi-drivers-pgsql
endef
@ -53,7 +53,7 @@ endef
define Package/libdbi-drivers-sqlite2
$(call Package/libdbi-drivers/default)
DEPENDS:=libdbi +libsqlite2
DEPENDS:=libdbi +PACKAGE_libdbi-drivers-sqlite2:libsqlite2
TITLE:= libdbi-drivers-sqlite2
endef
@ -63,7 +63,7 @@ endef
define Package/libdbi-drivers-sqlite3
$(call Package/libdbi-drivers/default)
DEPENDS:=libdbi +libsqlite3
DEPENDS:=libdbi +PACKAGE_libdbi-drivers-sqlite3:libsqlite3
TITLE:= libdbi-drivers-sqlite3
endef
@ -76,14 +76,14 @@ CONFIGURE_ARGS += \
--disable-static \
--disable-rpath \
--disable-docs \
--with-dbi-incdir=$(STAGING_DIR_HOST)/usr/include \
--with-dbi-libdir=$(STAGING_DIR_HOST)/usr/lib
--with-dbi-incdir=$(STAGING_DIR)/usr/include \
--with-dbi-libdir=$(STAGING_DIR)/usr/lib
ifneq ($(CONFIG_PACKAGE_libdbi-drivers-mysql),)
CONFIGURE_ARGS += \
--with-mysql \
--with-mysql-incdir=$(STAGING_DIR_HOST)/usr/include \
--with-mysql-libdir=$(STAGING_DIR_HOST)/usr/lib/mysql
--with-mysql-incdir=$(STAGING_DIR)/usr/include/mysql \
--with-mysql-libdir=$(STAGING_DIR)/usr/lib/mysql
TARGET_LDFLAGS += \
-L$(STAGING_DIR)/usr/lib/mysql/
endif
@ -91,22 +91,22 @@ endif
ifneq ($(SDK)$(CONFIG_PACKAGE_libdbi-drivers-pgsql),)
CONFIGURE_ARGS += \
--with-pgsql \
--with-pgsql-incdir=$(STAGING_DIR_HOST)/usr/include \
--with-pgsql-libdir=$(STAGING_DIR_HOST)/usr/lib
--with-pgsql-incdir=$(STAGING_DIR)/usr/include \
--with-pgsql-libdir=$(STAGING_DIR)/usr/lib
endif
ifneq ($(SDK)$(CONFIG_PACKAGE_libdbi-drivers-sqlite2),)
CONFIGURE_ARGS += \
--with-sqlite \
--with-sqlite-incdir=$(STAGING_DIR_HOST)/usr/include \
--with-sqlite-libdir=$(STAGING_DIR_HOST)/usr/lib
--with-sqlite-incdir=$(STAGING_DIR)/usr/include \
--with-sqlite-libdir=$(STAGING_DIR)/usr/lib
endif
ifneq ($(SDK)$(CONFIG_PACKAGE_libdbi-drivers-sqlite3),)
CONFIGURE_ARGS += \
--with-sqlite3 \
--with-sqlite3-incdir=$(STAGING_DIR_HOST)/usr/include \
--with-sqlite3-libdir=$(STAGING_DIR_HOST)/usr/lib
--with-sqlite3-incdir=$(STAGING_DIR)/usr/include \
--with-sqlite3-libdir=$(STAGING_DIR)/usr/lib
endif
define Package/libdbi-drivers-mysql/install

46
libs/libdbi-drivers/patches/001-configure_cflags_override.patch
View File

@ -1,46 +0,0 @@
--- a/configure.in
+++ b/configure.in
@@ -34,43 +34,6 @@ dnl ====================================
dnl Set some general compile options
dnl ====================================
-if test -z "$GCC"; then
- case $host in
- *-*-irix*)
- if test -z "$CC"; then
- CC=cc
- fi
- DEBUG="-g -signed"
- CFLAGS="-O2 -w -signed"
- PROFILE="-p -g3 -O2 -signed" ;;
- sparc-sun-solaris*)
- DEBUG="-v -g"
- CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
- PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc" ;;
- *)
- DEBUG="-g"
- CFLAGS="-O"
- PROFILE="-g -p" ;;
- esac
-else
-
- case $host in
- *-*-linux*)
- DEBUG="-g -Wall -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
- CFLAGS="-O20 -ffast-math -D_REENTRANT -fsigned-char"
- PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char";;
- sparc-sun-*)
- DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -mv8"
- CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8"
- PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;;
- *)
- DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
- CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"
- PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
- esac
-fi
-
-
AC_SUBST(DEBUG)
AC_SUBST(PROFILE)

11
libs/libdbi-drivers/patches/001_libsqlite3_fix.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -310,7 +310,7 @@ if test "$ac_sqlite3" = "yes"; then
AC_SEARCH_LIBS_VAR([sqlite3_exec], sqlite3, , , , SQLITE3_LIBS)
SQLITE3_LDFLAGS=""
else
- SQLITE3_LIBS=-lsqlite
+ SQLITE3_LIBS=-lsqlite3
SQLITE3_LDFLAGS=-L$ac_sqlite3_libdir
fi