diff options
author | Treeve Jelbert | 2008-10-12 17:00:32 +0200 |
---|---|---|
committer | Treeve Jelbert | 2008-10-12 17:00:32 +0200 |
commit | c3e79f2b700b9857bbdd19bbbc1282984e097ed8 (patch) | |
tree | 348409ac8b256b81944b2cd05f5d1fddda39c243 /odbc-drivers | |
parent | ec420f1cd6bdd6eebb9f5baa431feed7627f482b (diff) |
odbcjdbc - firebird has moved
Diffstat (limited to 'odbc-drivers')
-rw-r--r-- | odbc-drivers/odbcjdbc/HISTORY | 3 | ||||
-rw-r--r-- | odbc-drivers/odbcjdbc/fix.diff | 29 |
2 files changed, 12 insertions, 20 deletions
diff --git a/odbc-drivers/odbcjdbc/HISTORY b/odbc-drivers/odbcjdbc/HISTORY index 6cfb1b5a01..8afcc5ead5 100644 --- a/odbc-drivers/odbcjdbc/HISTORY +++ b/odbc-drivers/odbcjdbc/HISTORY @@ -1,3 +1,6 @@ +2008-10-12 Treeve Jelbert <treeve@sourcemage.org> + * fix.diff: firebird has moved + 2006-11-03 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 2.0.0144 * fix.diff: don't patch makefile.environ diff --git a/odbc-drivers/odbcjdbc/fix.diff b/odbc-drivers/odbcjdbc/fix.diff index b5121be57d..abede734df 100644 --- a/odbc-drivers/odbcjdbc/fix.diff +++ b/odbc-drivers/odbcjdbc/fix.diff @@ -1,25 +1,14 @@ 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 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)
- else
--INCLUDEDIR = -I/opt/firebird/include -I/usr/include/odbc
--EXTLIBDIR := -L/opt/firebird/lib -L/usr/lib/unixODBC $(EXTLIBDIR)
-+INCLUDEDIR = -I/usr/firebird/include -I/usr/include/odbc
-+EXTLIBDIR := -L/usr/firebird/lib -L/usr/lib/unixODBC $(EXTLIBDIR)
- endif
- #
-
@@ -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 -D$(ODBCMANAGER) $(INCLUDEDIR) -I$(FBINCDIR)
-+COMPFLAGS = -DPIC -fPIC $(CFLAGS) -w -D_REENTRANT -D_PTHREADS -DEXTERNAL -D$(ODBCMANAGER) $(INCLUDEDIR) -I$(FBINCDIR)
- #
+ LIST_ODBCJDBCSETUPSRC = $(addprefix $(ODBCJDBCDIR)/, $(ODBCJDBCSETUPSRC_LINUX)) + LIST_ODBCJDBCSETUPOBJ = $(addprefix $(BUILDDIR)/, $(ODBCJDBCSETUPSRC_LINUX:.cpp=.o)) + # +-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
+ #LINKFLAGS = -rdynamic -export-dynamic -shared + LINKFLAGS = -shared + EXTLIBS = $(EXTLIBDIR) -lcrypt -ldl |