diff options
| author |   Jeremy Olexa <darkside@gentoo.org> | 2008-10-14 03:15:05 +0000 |
|---|---|---|
| committer | Jeremy Olexa <darkside@gentoo.org> | 2008-10-14 03:15:05 +0000 |
| commit | 5238c07a30111fd0a146875070fda83e8c0d155b (patch) | |
| tree | bca5ee13e8d5206ce0bab51ff4787d2c3e7a6b3a /dev-db/sqliteodbc/files | |
| parent | Disable interactive tests better. (diff) | |
| download | gentoo-2-5238c07a30111fd0a146875070fda83e8c0d155b.tar.gz gentoo-2-5238c07a30111fd0a146875070fda83e8c0d155b.tar.bz2 gentoo-2-5238c07a30111fd0a146875070fda83e8c0d155b.zip | |
(non maintainer commit) remove old, broke versions. Add new version from Ingo Bormuth in bug #162180
(Portage version: 2.2_rc12/cvs/Linux 2.6.26-gentoo x86_64)
Diffstat (limited to 'dev-db/sqliteodbc/files')
| -rw-r--r-- | dev-db/sqliteodbc/files/sqliteodbc-0.64-gentoo.patch | 33 | ||||
| -rw-r--r-- | dev-db/sqliteodbc/files/sqliteodbc-0.77-iodbc.patch | 11 |
2 files changed, 11 insertions, 33 deletions
diff --git a/dev-db/sqliteodbc/files/sqliteodbc-0.64-gentoo.patch b/dev-db/sqliteodbc/files/sqliteodbc-0.64-gentoo.patch deleted file mode 100644 index 4812873b97fc..000000000000 --- a/dev-db/sqliteodbc/files/sqliteodbc-0.64-gentoo.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -ru sqliteodbc-0.64.orig/configure sqliteodbc-0.64/configure ---- sqliteodbc-0.64.orig/configure 2004-07-08 09:33:50.000000000 +0200 -+++ sqliteodbc-0.64/configure 2005-03-27 13:30:44.759094368 +0200 -@@ -5412,9 +5412,9 @@ - ODBC_FLAGS=UNKNOWN - ODBC_LIB=UNKNOWN - for i in $ODBC_DIR ; do -- if test -r "$i/include/sql.h" ; then -- if test -r "$i/include/iodbcinst.h" ; then -- ODBC_FLAGS="-DHAVE_IODBC=1 -I$i/include" -+ if test -r "$i/include/iodbc/sql.h" -o -r "$i/include/sql.h" ; then -+ if test -r "$i/include/iodbc/iodbcinst.h" ; then -+ ODBC_FLAGS="-DHAVE_IODBC=1 -I$i/include/iodbc" - if test -r "$i/lib/libiodbcinst.la" ; then - ODBC_LIB="$i/lib/libiodbcinst.la" - else -diff -ru sqliteodbc-0.64.orig/configure.in sqliteodbc-0.64/configure.in ---- sqliteodbc-0.64.orig/configure.in 2004-07-08 09:30:56.000000000 +0200 -+++ sqliteodbc-0.64/configure.in 2005-03-27 13:30:29.765373760 +0200 -@@ -170,9 +170,9 @@ - ODBC_FLAGS=UNKNOWN - ODBC_LIB=UNKNOWN - for i in $ODBC_DIR ; do -- if test -r "$i/include/sql.h" ; then -- if test -r "$i/include/iodbcinst.h" ; then -- ODBC_FLAGS="-DHAVE_IODBC=1 -I$i/include" -+ if test -r "$i/include/iodbc/sql.h" -o -r "$i/include/sql.h" ; then -+ if test -r "$i/include/iodbc/iodbcinst.h" ; then -+ ODBC_FLAGS="-DHAVE_IODBC=1 -I$i/include/iodbc" - if test -r "$i/lib/libiodbcinst.la" ; then - ODBC_LIB="$i/lib/libiodbcinst.la" - else -Only in sqliteodbc-0.64: .configure.in.swp diff --git a/dev-db/sqliteodbc/files/sqliteodbc-0.77-iodbc.patch b/dev-db/sqliteodbc/files/sqliteodbc-0.77-iodbc.patch new file mode 100644 index 000000000000..4e33006be534 --- /dev/null +++ b/dev-db/sqliteodbc/files/sqliteodbc-0.77-iodbc.patch @@ -0,0 +1,11 @@ +--- sqliteodbc-0.77/configure.in.orig 2008-07-19 14:10:18.000000000 +0300 ++++ sqliteodbc-0.77/configure.in 2008-07-19 14:11:06.000000000 +0300 +@@ -273,7 +273,7 @@ + for i in $ODBC_DIR ; do + if test -r "$i/include/iodbc/sql.h" -o -r "$i/include/sql.h" ; then + if test -r "$i/include/iodbc/iodbcinst.h" ; then +- ODBC_FLAGS="-DHAVE_IODBC=1 -I$i/iodbc/include" ++ ODBC_FLAGS="-DHAVE_IODBC=1 -I$i/include/iodbc" + if test -r "$i/lib/libiodbcinst.la" ; then + ODBC_LIB="$i/lib/libiodbcinst.la" + else |