Attachment 56397 Details for Bug 34432 – patch to FireBird ODBC for Debian GNU/Linux amd64

[patch] patch to FireBird ODBC for Debian GNU/Linux amd64

fb-odbc-debian-amd64.patch (text/plain), 2.70 KB, created by Lionel Elie Mamane on 2012-01-31 07:55:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lionel Elie Mamane

Created: 2012-01-31 07:55:01 UTC

Size: 2.70 KB

patch

obsolete

>diff --recursive -u OdbcJdbc//Builds/Gcc.lin/makefile.linux ../OdbcJdbc//Builds/Gcc.lin/makefile.linux
>--- OdbcJdbc//Builds/Gcc.lin/makefile.linux	2009-12-21 10:56:14.000000000 +0100
>+++ ../OdbcJdbc//Builds/Gcc.lin/makefile.linux	2012-01-23 19:38:51.000000000 +0100
>@@ -53,11 +53,7 @@
> #ODBCMANAGER	= iODBC
> endif
> 
>-ifeq ($(ARCH),x86_64)
>-LIB = lib64
>-else
> LIB = lib
>-endif
> 
> ifeq (iODBC,$(ODBCMANAGER))
> LIBODBCINST 	= -liodbcinst
>@@ -71,7 +67,7 @@
> EXTLIBDIR       = -L/usr/$(LIB)
> endif
> 
>-INCLUDEDIR      = -I$(FBINCDIR) -I/usr/include/odbc $(INCLUDEDIR)
>+INCLUDEDIR      += -I$(FBINCDIR) -I/usr/include/odbc
> EXTLIBDIR       := -L$(FBLIBDIR -L$(UNIXODBCDIR) $(EXTLIBDIR)
> 
> ifeq (Yes,$(DEBUG))
>@@ -93,11 +89,13 @@
> #
> COMPFLAGS	= -g -w -D_REENTRANT -D_PTHREADS -DEXTERNAL -D$(ODBCMANAGER) $(INCLUDEDIR) -I$(FBINCDIR)
> 
>+COMPFLAGS += -ggdb
>+
> ifeq ($(ARCH),x86_64)
>-COMPFLAGS	:= -fPIC -m64
>+COMPFLAGS	+= -fPIC -m64
> LINKFLAGS	= -shared -m64
> else
>-COMPFLAGS	:= -m32
>+COMPFLAGS	+= -m32
> LINKFLAGS	= -shared -m32
> endif
> #
>Only in ../OdbcJdbc//Builds/Gcc.lin: makefile.linux~
>Only in ../OdbcJdbc//Builds/Gcc.lin: Release_x86_64
>diff --recursive -u OdbcJdbc//Builds/makefile.environ ../OdbcJdbc//Builds/makefile.environ
>--- OdbcJdbc//Builds/makefile.environ	2009-11-05 10:46:53.000000000 +0100
>+++ ../OdbcJdbc//Builds/makefile.environ	2012-01-23 19:37:00.000000000 +0100
>@@ -4,6 +4,8 @@
> #FBLIBDIR	= /mnt/third_party/interbase/sun5-2003-3-10/lib
> #
> 
>+FIREBIRD=/usr
>+
> # Define ARCH in the calling makefile if you want to target a different architecture
> ifndef ARCH
> ARCH=$(shell uname -m)
>@@ -11,11 +13,7 @@
> 
> $(warning ARCH is $(ARCH))
> 
>-ifeq ($(ARCH),x86_64)
>-	UNIXODBCDIR = $(shell if [ -d /usr/lib64/unixODBC ]; then echo /usr/lib64/unixODBC; else echo /usr/lib64; fi)
>-else
>-	UNIXODBCDIR = $(shell if [ -d /usr/lib/unixODBC ]; then echo /usr/lib/unixODBC; else echo /usr/lib; fi)
>-endif
>+UNIXODBCDIR = $(shell if [ -d /usr/lib/unixODBC ]; then echo /usr/lib/unixODBC; else echo /usr/lib; fi)
> 
> ifndef ODBCMANAGER
> # This test is a mess. iodbc isn't even shipped with most distros
>Only in ../OdbcJdbc//Builds: makefile.environ~
>Only in ../OdbcJdbc/: foo
>diff --recursive -u OdbcJdbc//MainUnicode.cpp ../OdbcJdbc//MainUnicode.cpp
>--- OdbcJdbc//MainUnicode.cpp	2008-09-21 15:53:55.000000000 +0200
>+++ ../OdbcJdbc//MainUnicode.cpp	2012-01-23 19:43:41.000000000 +0100
>@@ -114,7 +114,7 @@
> 
> 	operator SQLCHAR*()	{ return byteString; }
> #if (SIZEOF_LONG != 8) || defined(BUILD_REAL_64_BIT_MODE)
>-	operator int() { return lengthString; }
>+  //operator int() { return lengthString; }
> #endif
> 	operator SQLSMALLINT() { return lengthString; }
> 	operator SQLINTEGER() { return lengthString; }
>Only in ../OdbcJdbc/: MainUnicode.cpp~
>Only in ../OdbcJdbc/: tst

Actions: View

Attachments on bug 34432: 43664 | 43665 | 56039 | 56397