diff options
author | Treeve Jelbert | 2006-07-03 22:18:54 +0200 |
---|---|---|
committer | Treeve Jelbert | 2006-07-03 22:18:54 +0200 |
commit | 777926f7061f178e957a0ba8606d18babbe9959e (patch) | |
tree | 116bfb5fd56482000bf16793745326a46ee089d5 /odbc-drivers | |
parent | d080d1cf445e92caed06b65db50da3584f346636 (diff) |
odbcjdbc-beta-2.0.0139
Diffstat (limited to 'odbc-drivers')
-rwxr-xr-x | odbc-drivers/odbcjdbc/DETAILS | 4 | ||||
-rw-r--r-- | odbc-drivers/odbcjdbc/HISTORY | 4 | ||||
-rw-r--r-- | odbc-drivers/odbcjdbc/fix.diff | 41 | ||||
-rw-r--r-- | odbc-drivers/odbcjdbc/odbc.in | 4 |
4 files changed, 16 insertions, 37 deletions
diff --git a/odbc-drivers/odbcjdbc/DETAILS b/odbc-drivers/odbcjdbc/DETAILS index eeeb4c3fe4..5b2eecfc9a 100755 --- a/odbc-drivers/odbcjdbc/DETAILS +++ b/odbc-drivers/odbcjdbc/DETAILS @@ -2,8 +2,8 @@ local SPELLX SFCVS SPELLX=OdbcJdbc WEB_SITE=http://www.ibphoenix.com - VERSION=beta-2.0.0138 - SOURCE_HASH=sha512:f9404befc8a8cbfd1530ce5e7592db3632c812950cf23a960bf90d3b88bb6a1896a9303a89108d548d84930c0872461d94c0e7cffc47ed35439488b50b092b21 + VERSION=beta-2.0.0139 + SOURCE_HASH=sha512:c7412d313d57429886d48618d8adb04bf9ec8c6a474bc68cc3d58fc2d768cb197f0e2aa99a06f30f671d4bd7fcc6759a335ea8c8cd3f1fed780c426a11e0ae69 SOURCE=${SPELLX}-$VERSION-src.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/ODBC\_V2-0-BETA SOURCE_URL[0]=http://www.praktik.km.ua/downloads/$SOURCE diff --git a/odbc-drivers/odbcjdbc/HISTORY b/odbc-drivers/odbcjdbc/HISTORY index 2c21290d30..446d9dde21 100644 --- a/odbc-drivers/odbcjdbc/HISTORY +++ b/odbc-drivers/odbcjdbc/HISTORY @@ -1,3 +1,7 @@ +2006-07-03 Treeve Jelbert <treeve01@pi.be> + * DETAILS: version 2.0.0139 + * fix.diff, odbc,in: update to new file names + 2006-06-28 Treeve Jelbert <treeve01@pi.be> * DETAILS: version 2.0.0138 * fix.diff: updated patch, some changes now in tarball diff --git a/odbc-drivers/odbcjdbc/fix.diff b/odbc-drivers/odbcjdbc/fix.diff index a86b6b0646..b087b72fc1 100644 --- a/odbc-drivers/odbcjdbc/fix.diff +++ b/odbc-drivers/odbcjdbc/fix.diff @@ -1,6 +1,6 @@ diff -uNr ODBC_V2-0-BETA/OdbcJdbc/Builds/Gcc.lin/makefile.linux ODBC_V2-0-BETA.cp/OdbcJdbc/Builds/Gcc.lin/makefile.linux ---- ODBC_V2-0-BETA/OdbcJdbc/Builds/Gcc.lin/makefile.linux 2004-12-21 19:39:24.000000000 +0100 -+++ ODBC_V2-0-BETA.cp/OdbcJdbc/Builds/Gcc.lin/makefile.linux 2006-06-28 15:30:45.000000000 +0200 +--- ODBC_V2-0-BETA/OdbcJdbc/Builds/Gcc.lin/makefile.linux 2006-07-03 15:10:00.000000000 +0200 ++++ ODBC_V2-0-BETA.cp/OdbcJdbc/Builds/Gcc.lin/makefile.linux 2006-07-03 22:10:28.000000000 +0200 @@ -55,8 +55,8 @@ INCLUDEDIR := -I/opt/interbase/include -I/usr/include/odbc $(INCLUDEDIR)
EXTLIBDIR := -L/opt/interbase/lib -L/usr/lib/unixODBC $(EXTLIBDIR)
@@ -12,18 +12,20 @@ diff -uNr ODBC_V2-0-BETA/OdbcJdbc/Builds/Gcc.lin/makefile.linux ODBC_V2-0-BETA.c endif
#
-@@ -75,7 +75,7 @@ +@@ -75,8 +75,9 @@ LIST_ODBCJDBCSETUPSRC = $(addprefix $(ODBCJDBCDIR)/, $(ODBCJDBCSETUPSRC_LINUX))
LIST_ODBCJDBCSETUPOBJ = $(addprefix $(BUILDDIR)/, $(ODBCJDBCSETUPSRC_LINUX:.cpp=.o))
#
--COMPFLAGS = -g -w -D_REENTRANT -D_PTHREADS -DEXTERNAL $(INCLUDEDIR) -I$(FBINCDIR)
-+COMPFLAGS = -DPIC -fPIC $(CFLAGS) -w -D_REENTRANT -D_PTHREADS -DEXTERNAL $(INCLUDEDIR) -I$(FBINCDIR)
+-COMPFLAGS = -g -w -D_REENTRANT -D_PTHREADS -DEXTERNAL -D$(ODBCMANAGER) $(INCLUDEDIR) -I$(FBINCDIR)
++COMPFLAGS = -DPIC -fPIC $(CFLAGS) -w -D_REENTRANT -D_PTHREADS -DEXTERNAL -D$(ODBCMANAGER) $(INCLUDEDIR) -I$(FBINCDIR)
#
++ #LINKFLAGS = -rdynamic -export-dynamic -shared
LINKFLAGS = -shared
+ EXTLIBS = $(EXTLIBDIR) -lcrypt -ldl
diff -uNr ODBC_V2-0-BETA/OdbcJdbc/Builds/makefile.environ ODBC_V2-0-BETA.cp/OdbcJdbc/Builds/makefile.environ --- ODBC_V2-0-BETA/OdbcJdbc/Builds/makefile.environ 2003-12-13 19:27:26.000000000 +0100 -+++ ODBC_V2-0-BETA.cp/OdbcJdbc/Builds/makefile.environ 2006-06-28 15:27:20.000000000 +0200 ++++ ODBC_V2-0-BETA.cp/OdbcJdbc/Builds/makefile.environ 2006-07-03 21:56:27.000000000 +0200 @@ -3,8 +3,8 @@ #FBINCDIR = /mnt/third_party/interbase/sun5-2003-3-10/include
#FBLIBDIR = /mnt/third_party/interbase/sun5-2003-3-10/lib
@@ -35,30 +37,3 @@ diff -uNr ODBC_V2-0-BETA/OdbcJdbc/Builds/makefile.environ ODBC_V2-0-BETA.cp/Odbc #
ISCDBCDIR = ../../IscDbc
ODBCJDBCDIR = ../..
-diff -uNr ODBC_V2-0-BETA/OdbcJdbc/MainUnicode.cpp ODBC_V2-0-BETA.cp/OdbcJdbc/MainUnicode.cpp ---- ODBC_V2-0-BETA/OdbcJdbc/MainUnicode.cpp 2006-06-04 21:33:08.000000000 +0200 -+++ ODBC_V2-0-BETA.cp/OdbcJdbc/MainUnicode.cpp 2006-06-28 15:38:11.000000000 +0200 -@@ -37,7 +37,9 @@ -
- extern FILE *logFile;
- using namespace OdbcJdbcLibrary;
-+#ifdef _WIN32 - extern UINT codePage; // from Main.cpp
-+#endif -
- template <typename TypeRealLen = SQLSMALLINT>
- class ConvertingString
-diff -uNr ODBC_V2-0-BETA/OdbcJdbc/OdbcInstGetProp.cpp ODBC_V2-0-BETA.cp/OdbcJdbc/OdbcInstGetProp.cpp ---- ODBC_V2-0-BETA/OdbcJdbc/OdbcInstGetProp.cpp 2006-06-21 16:54:06.000000000 +0200 -+++ ODBC_V2-0-BETA.cp/OdbcJdbc/OdbcInstGetProp.cpp 2006-06-28 15:39:15.000000000 +0200 -@@ -1,4 +1,5 @@ -
-+#ifndef _IODBCUNIX_H - #ifndef _WIN32
- #include <stdlib.h>
- #include <memory.h>
-@@ -190,3 +191,4 @@ - }
-
- #endif
-+#endif diff --git a/odbc-drivers/odbcjdbc/odbc.in b/odbc-drivers/odbcjdbc/odbc.in index 946644c2bf..6536b3766b 100644 --- a/odbc-drivers/odbcjdbc/odbc.in +++ b/odbc-drivers/odbcjdbc/odbc.in @@ -1,7 +1,7 @@ [Firebird] Description = Firebird ODBC driver -Driver = /usr/lib/libOdbcJdbc.so -Setup = /usr/lib/libOdbcJdbcS.so +Driver = /usr/lib/libFbOdbc.so +Setup = /usr/lib/libFbOdbc.so Threading = 1 FileUsage = 1 CPTimeout = |