Update to version 2.3.3
- Removed patches and sources included upstream - Recreated so-version-bump.patch
This commit is contained in:
Jan Staněk
parent
027ea96bf2
commit
82d9eb798c
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,2 +1,3 @@
|
||||
/unixODBC-2.3.1.tar.gz
|
||||
/unixODBC-2.3.2.tar.gz
|
||||
/unixODBC-2.3.3.tar.gz
|
||||
|
||||
330
depcomp.patch
330
depcomp.patch
@ -1,330 +0,0 @@
|
||||
--- unixODBC-2.2.8/depcomp 2001-10-28 16:26:53.000000000 -0500
|
||||
+++ unixODBC-2.2.8-rh/depcomp 2003-07-02 11:40:03.000000000 -0400
|
||||
@@ -31,7 +31,16 @@
|
||||
fi
|
||||
# `libtool' can also be set to `yes' or `no'.
|
||||
|
||||
-depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`}
|
||||
+if test -z "$depfile"; then
|
||||
+ base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'`
|
||||
+ dir=`echo "$object" | sed 's,/.*$,/,'`
|
||||
+ if test "$dir" = "$object"; then
|
||||
+ dir=
|
||||
+ fi
|
||||
+ # FIXME: should be _deps on DOS.
|
||||
+ depfile="$dir.deps/$base"
|
||||
+fi
|
||||
+
|
||||
tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
|
||||
|
||||
rm -f "$tmpdepfile"
|
||||
@@ -197,18 +206,53 @@
|
||||
rm -f "$tmpdepfile"
|
||||
;;
|
||||
|
||||
+icc)
|
||||
+ # Must come before tru64.
|
||||
+
|
||||
+ # Intel's C compiler understands `-MD -MF file'. However
|
||||
+ # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
|
||||
+ # will fill foo.d with something like
|
||||
+ # foo.o: sub/foo.c
|
||||
+ # foo.o: sub/foo.h
|
||||
+ # which is wrong. We want:
|
||||
+ # sub/foo.o: sub/foo.c
|
||||
+ # sub/foo.o: sub/foo.h
|
||||
+ # sub/foo.c:
|
||||
+ # sub/foo.h:
|
||||
+
|
||||
+ "$@" -MD -MF "$tmpdepfile"
|
||||
+ stat=$?
|
||||
+ if test $stat -eq 0; then :
|
||||
+ else
|
||||
+ rm -f "$tmpdepfile"
|
||||
+ exit $stat
|
||||
+ fi
|
||||
+ rm -f "$depfile"
|
||||
+ # Each line is of the form `foo.o: dependent.h'.
|
||||
+ # Do two passes, one to just change these to
|
||||
+ # `$object: dependent.h' and one to simply `dependent.h:'.
|
||||
+ sed -e "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
|
||||
+ sed -e "s,^[^:]*: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
|
||||
+ rm -f "$tmpdepfile"
|
||||
+ ;;
|
||||
+
|
||||
tru64)
|
||||
- # The Tru64 AIX compiler uses -MD to generate dependencies as a side
|
||||
+ # The Tru64 compiler uses -MD to generate dependencies as a side
|
||||
# effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
|
||||
- # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
|
||||
+ # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
|
||||
# dependencies in `foo.d' instead, so we check for that too.
|
||||
# Subdirectories are respected.
|
||||
+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
|
||||
+ test "x$dir" = "x$object" && dir=
|
||||
+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
|
||||
|
||||
- tmpdepfile1="$object.d"
|
||||
- tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'`
|
||||
if test "$libtool" = yes; then
|
||||
+ tmpdepfile1="$dir.libs/$base.lo.d"
|
||||
+ tmpdepfile2="$dir.libs/$base.d"
|
||||
"$@" -Wc,-MD
|
||||
else
|
||||
+ tmpdepfile1="$dir$base.o.d"
|
||||
+ tmpdepfile2="$dir$base.d"
|
||||
"$@" -MD
|
||||
fi
|
||||
|
||||
@@ -240,34 +284,42 @@
|
||||
|
||||
dashmstdout)
|
||||
# Important note: in order to support this mode, a compiler *must*
|
||||
- # always write the proprocessed file to stdout, regardless of -o,
|
||||
- # because we must use -o when running libtool.
|
||||
- test -z "$dashmflag" && dashmflag=-M
|
||||
- ( IFS=" "
|
||||
- case " $* " in
|
||||
- *" --mode=compile "*) # this is libtool, let us make it quiet
|
||||
- for arg
|
||||
- do # cycle over the arguments
|
||||
- case "$arg" in
|
||||
- "--mode=compile")
|
||||
- # insert --quiet before "--mode=compile"
|
||||
- set fnord "$@" --quiet
|
||||
- shift # fnord
|
||||
- ;;
|
||||
- esac
|
||||
- set fnord "$@" "$arg"
|
||||
- shift # fnord
|
||||
- shift # "$arg"
|
||||
- done
|
||||
+ # always write the proprocessed file to stdout, regardless of -o.
|
||||
+ "$@" || exit $?
|
||||
+
|
||||
+ # Remove the call to Libtool.
|
||||
+ if test "$libtool" = yes; then
|
||||
+ while test $1 != '--mode=compile'; do
|
||||
+ shift
|
||||
+ done
|
||||
+ shift
|
||||
+ fi
|
||||
+
|
||||
+ # Remove `-o $object'.
|
||||
+ IFS=" "
|
||||
+ for arg
|
||||
+ do
|
||||
+ case $arg in
|
||||
+ -o)
|
||||
+ shift
|
||||
+ ;;
|
||||
+ $object)
|
||||
+ shift
|
||||
+ ;;
|
||||
+ *)
|
||||
+ set fnord "$@" "$arg"
|
||||
+ shift # fnord
|
||||
+ shift # $arg
|
||||
;;
|
||||
esac
|
||||
- "$@" $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
|
||||
- ) &
|
||||
- proc=$!
|
||||
- "$@"
|
||||
- stat=$?
|
||||
- wait "$proc"
|
||||
- if test "$stat" != 0; then exit $stat; fi
|
||||
+ done
|
||||
+
|
||||
+ test -z "$dashmflag" && dashmflag=-M
|
||||
+ # Require at least two characters before searching for `:'
|
||||
+ # in the target name. This is to cope with DOS-style filenames:
|
||||
+ # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
|
||||
+ "$@" $dashmflag |
|
||||
+ sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
|
||||
rm -f "$depfile"
|
||||
cat < "$tmpdepfile" > "$depfile"
|
||||
tr ' ' '
|
||||
@@ -285,36 +337,40 @@
|
||||
;;
|
||||
|
||||
makedepend)
|
||||
- # X makedepend
|
||||
- (
|
||||
- shift
|
||||
- cleared=no
|
||||
- for arg in "$@"; do
|
||||
- case $cleared in no)
|
||||
- set ""; shift
|
||||
- cleared=yes
|
||||
- esac
|
||||
- case "$arg" in
|
||||
- -D*|-I*)
|
||||
- set fnord "$@" "$arg"; shift;;
|
||||
- -*)
|
||||
- ;;
|
||||
- *)
|
||||
- set fnord "$@" "$arg"; shift;;
|
||||
- esac
|
||||
+ "$@" || exit $?
|
||||
+ # Remove any Libtool call
|
||||
+ if test "$libtool" = yes; then
|
||||
+ while test $1 != '--mode=compile'; do
|
||||
+ shift
|
||||
done
|
||||
- obj_suffix="`echo $object | sed 's/^.*\././'`"
|
||||
- touch "$tmpdepfile"
|
||||
- ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@"
|
||||
- ) &
|
||||
- proc=$!
|
||||
- "$@"
|
||||
- stat=$?
|
||||
- wait "$proc"
|
||||
- if test "$stat" != 0; then exit $stat; fi
|
||||
+ shift
|
||||
+ fi
|
||||
+ # X makedepend
|
||||
+ shift
|
||||
+ cleared=no
|
||||
+ for arg in "$@"; do
|
||||
+ case $cleared in
|
||||
+ no)
|
||||
+ set ""; shift
|
||||
+ cleared=yes ;;
|
||||
+ esac
|
||||
+ case "$arg" in
|
||||
+ -D*|-I*)
|
||||
+ set fnord "$@" "$arg"; shift ;;
|
||||
+ # Strip any option that makedepend may not understand. Remove
|
||||
+ # the object too, otherwise makedepend will parse it as a source file.
|
||||
+ -*|$object)
|
||||
+ ;;
|
||||
+ *)
|
||||
+ set fnord "$@" "$arg"; shift ;;
|
||||
+ esac
|
||||
+ done
|
||||
+ obj_suffix="`echo $object | sed 's/^.*\././'`"
|
||||
+ touch "$tmpdepfile"
|
||||
+ ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
|
||||
rm -f "$depfile"
|
||||
cat < "$tmpdepfile" > "$depfile"
|
||||
- tail +3 "$tmpdepfile" | tr ' ' '
|
||||
+ sed '1,2d' "$tmpdepfile" | tr ' ' '
|
||||
' | \
|
||||
## Some versions of the HPUX 10.20 sed can't process this invocation
|
||||
## correctly. Breaking it into two sed invocations is a workaround.
|
||||
@@ -324,35 +380,39 @@
|
||||
|
||||
cpp)
|
||||
# Important note: in order to support this mode, a compiler *must*
|
||||
- # always write the proprocessed file to stdout, regardless of -o,
|
||||
- # because we must use -o when running libtool.
|
||||
- ( IFS=" "
|
||||
- case " $* " in
|
||||
- *" --mode=compile "*)
|
||||
- for arg
|
||||
- do # cycle over the arguments
|
||||
- case $arg in
|
||||
- "--mode=compile")
|
||||
- # insert --quiet before "--mode=compile"
|
||||
- set fnord "$@" --quiet
|
||||
- shift # fnord
|
||||
- ;;
|
||||
- esac
|
||||
- set fnord "$@" "$arg"
|
||||
- shift # fnord
|
||||
- shift # "$arg"
|
||||
- done
|
||||
+ # always write the proprocessed file to stdout.
|
||||
+ "$@" || exit $?
|
||||
+
|
||||
+ # Remove the call to Libtool.
|
||||
+ if test "$libtool" = yes; then
|
||||
+ while test $1 != '--mode=compile'; do
|
||||
+ shift
|
||||
+ done
|
||||
+ shift
|
||||
+ fi
|
||||
+
|
||||
+ # Remove `-o $object'.
|
||||
+ IFS=" "
|
||||
+ for arg
|
||||
+ do
|
||||
+ case $arg in
|
||||
+ -o)
|
||||
+ shift
|
||||
+ ;;
|
||||
+ $object)
|
||||
+ shift
|
||||
+ ;;
|
||||
+ *)
|
||||
+ set fnord "$@" "$arg"
|
||||
+ shift # fnord
|
||||
+ shift # $arg
|
||||
;;
|
||||
esac
|
||||
- "$@" -E |
|
||||
+ done
|
||||
+
|
||||
+ "$@" -E |
|
||||
sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
|
||||
sed '$ s: \\$::' > "$tmpdepfile"
|
||||
- ) &
|
||||
- proc=$!
|
||||
- "$@"
|
||||
- stat=$?
|
||||
- wait "$proc"
|
||||
- if test "$stat" != 0; then exit $stat; fi
|
||||
rm -f "$depfile"
|
||||
echo "$object : \\" > "$depfile"
|
||||
cat < "$tmpdepfile" >> "$depfile"
|
||||
@@ -364,32 +424,25 @@
|
||||
# Important note: in order to support this mode, a compiler *must*
|
||||
# always write the proprocessed file to stdout, regardless of -o,
|
||||
# because we must use -o when running libtool.
|
||||
- ( IFS=" "
|
||||
- case " $* " in
|
||||
- *" --mode=compile "*)
|
||||
- for arg
|
||||
- do # cycle over the arguments
|
||||
- case $arg in
|
||||
- "--mode=compile")
|
||||
- # insert --quiet before "--mode=compile"
|
||||
- set fnord "$@" --quiet
|
||||
- shift # fnord
|
||||
- ;;
|
||||
- esac
|
||||
+ "$@" || exit $?
|
||||
+ IFS=" "
|
||||
+ for arg
|
||||
+ do
|
||||
+ case "$arg" in
|
||||
+ "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
|
||||
+ set fnord "$@"
|
||||
+ shift
|
||||
+ shift
|
||||
+ ;;
|
||||
+ *)
|
||||
set fnord "$@" "$arg"
|
||||
- shift # fnord
|
||||
- shift # "$arg"
|
||||
- done
|
||||
- ;;
|
||||
+ shift
|
||||
+ shift
|
||||
+ ;;
|
||||
esac
|
||||
- "$@" -E |
|
||||
- sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
|
||||
- ) &
|
||||
- proc=$!
|
||||
- "$@"
|
||||
- stat=$?
|
||||
- wait "$proc"
|
||||
- if test "$stat" != 0; then exit $stat; fi
|
||||
+ done
|
||||
+ "$@" -E |
|
||||
+ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
|
||||
rm -f "$depfile"
|
||||
echo "$object : \\" > "$depfile"
|
||||
. "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
|
||||
52
dltest.1
52
dltest.1
@ -1,52 +0,0 @@
|
||||
.TH dltest 1 "Thu 13 Feb 2014" "version 2.3.2" "UnixODBC manual pages"
|
||||
.SH NAME
|
||||
dltest \- A simple library symbol test
|
||||
|
||||
.SH SYNOPSIS
|
||||
.B dltest
|
||||
.R [
|
||||
.I library symbol
|
||||
.R ]
|
||||
|
||||
.SH DESCRIPTION
|
||||
.B dltest
|
||||
is simple test of occurence of the
|
||||
.I symbol
|
||||
in the
|
||||
.IR library .
|
||||
The
|
||||
.I library
|
||||
must be a full (with path) file name of the shared object, in which the search for
|
||||
.I symbol
|
||||
should be performed.
|
||||
|
||||
Without any parameters, dltest print short help message.
|
||||
|
||||
.SH EXAMPLES
|
||||
To determine if the symbol
|
||||
.B printf
|
||||
is found in the
|
||||
.IR libc-2\.18\.so :
|
||||
|
||||
.RS
|
||||
$ dltest /usr/lib/libc-2.18.so printf
|
||||
.RE
|
||||
|
||||
.SH AUTHORS
|
||||
The authors of unixODBC are
|
||||
.MT pharvey@codebydesign.com
|
||||
Peter Harvey
|
||||
.ME
|
||||
and
|
||||
.MT nick@lurcher.org
|
||||
Nick Gorham
|
||||
.ME .
|
||||
For the full list of contributors see the
|
||||
.I AUTHORS
|
||||
file.
|
||||
|
||||
.SH COPYRIGHT
|
||||
unixODBC is licensed under the GNU Lesser General Public License. For details
|
||||
about the license, see the
|
||||
.I COPYING
|
||||
file.
|
||||
117
odbc_config.1
117
odbc_config.1
@ -1,117 +0,0 @@
|
||||
.TH odbc_config 1 "Thu 13 Feb 2014" "version 2.3.2" "UnixODBC manual pages"
|
||||
|
||||
.SH NAME
|
||||
odbc_config \- get compile options for compiling unixODBC client
|
||||
|
||||
.SH SYNOPSIS
|
||||
.SY odbc_config
|
||||
.OP \-\-prefix
|
||||
.OP \-\-exec-prefix
|
||||
.OP \-\-include-prefix
|
||||
.OP \-\-lib-prefix
|
||||
.OP \-\-bin-prefix
|
||||
.OP \-\-version
|
||||
.OP \-\-libs
|
||||
.OP \-\-static-libs
|
||||
.OP \-\-libtool-libs
|
||||
.OP \-\-cflags
|
||||
.OP \-\-odbcversion
|
||||
.OP \-\-odbcini
|
||||
.OP \-\-odbcinstini
|
||||
.OP \-\-header
|
||||
.OP \-\-ulen
|
||||
.YS
|
||||
|
||||
.SH DESCRIPTION
|
||||
.B odbc_config
|
||||
provides built-in options, specified at build time of the unixODBC suite, which
|
||||
are useful for building unixODBC clients and similar programs.
|
||||
|
||||
.SH OPTIONS
|
||||
.B
|
||||
.IP \-\-prefix
|
||||
Prefix for architecture-independent file tree.
|
||||
|
||||
.B
|
||||
.IP \-\-exec-prefix
|
||||
Prefix for architecture-dependent file tree.
|
||||
|
||||
.B
|
||||
.IP \-\-include-prefix
|
||||
Directory with C header files for unixODBC.
|
||||
|
||||
.B
|
||||
.IP \-\-lib-prefix
|
||||
Directory with object code (.so) libraries.
|
||||
|
||||
.B
|
||||
.IP \-\-bin-prefix
|
||||
Location of user executables.
|
||||
|
||||
.B
|
||||
.IP \-\-version
|
||||
unixODBC version.
|
||||
|
||||
.B
|
||||
.IP \-\-libs
|
||||
Compiler flags for linking dynamic libraries.
|
||||
|
||||
.B
|
||||
.IP \-\-static-libs
|
||||
Absolute file name of static unixODBC library.
|
||||
|
||||
.B
|
||||
.IP \-\-libtool-libs
|
||||
Absolute file name of libtool unixODBC library.
|
||||
|
||||
.B
|
||||
.IP \-\-cflags
|
||||
Compiler flags to find include files and critical compiler flags and defines used
|
||||
when compiling the libodbc library.
|
||||
|
||||
.B
|
||||
.IP \-\-odbcversion
|
||||
Version of the ODBC specification used by the unixODBC.
|
||||
|
||||
.B
|
||||
.IP \-\-odbcini
|
||||
Absolute file name of the system-wide DSN configuration file
|
||||
.IR odbc.ini .
|
||||
|
||||
.B
|
||||
.IP \-\-odbcinstini
|
||||
Absolute file name of the driver configuration file
|
||||
.IR odbcinst.ini .
|
||||
|
||||
.B
|
||||
.IP \-\-header
|
||||
Definitions of used C preprocessor constants. It is suitable to be piped into
|
||||
C header file.
|
||||
|
||||
.B
|
||||
.IP \-\-ulen
|
||||
Compiler flag for defining
|
||||
.IR SIZEOF_SQLULEN .
|
||||
|
||||
.SH SEE ALSO
|
||||
.BR odbcinst.ini (5),
|
||||
.BR odbc.ini (5)
|
||||
|
||||
.SH AUTHORS
|
||||
The authors of unixODBC are
|
||||
.MT pharvey@codebydesign.com
|
||||
Peter Harvey
|
||||
.ME
|
||||
and
|
||||
.MT nick@lurcher.org
|
||||
Nick Gorham
|
||||
.ME .
|
||||
For the full list of contributors see the
|
||||
.I AUTHORS
|
||||
file.
|
||||
|
||||
.SH COPYRIGHT
|
||||
unixODBC is licensed under the GNU Lesser General Public License. For details
|
||||
about the license, see the
|
||||
.I COPYING
|
||||
file.
|
||||
@ -1,179 +1,34 @@
|
||||
Set the major .so version to 2 for all unixODBC shared libraries, to reflect
|
||||
the incompatible ABI changes in 2.2.14.
|
||||
|
||||
|
||||
diff -Naur unixODBC-2.3.1.orig/DRVConfig/Mimer/Makefile.am unixODBC-2.3.1/DRVConfig/Mimer/Makefile.am
|
||||
--- unixODBC-2.3.1.orig/DRVConfig/Mimer/Makefile.am 2009-12-11 11:54:07.000000000 -0500
|
||||
+++ unixODBC-2.3.1/DRVConfig/Mimer/Makefile.am 2011-12-02 14:01:00.153970964 -0500
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
INCLUDES = -I@top_srcdir@/include $(LTDLINCL)
|
||||
|
||||
-libmimerS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module
|
||||
+libmimerS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module
|
||||
|
||||
libmimerS_la_SOURCES = mimerS.c
|
||||
|
||||
diff -Naur unixODBC-2.3.1.orig/DRVConfig/MiniSQL/Makefile.am unixODBC-2.3.1/DRVConfig/MiniSQL/Makefile.am
|
||||
--- unixODBC-2.3.1.orig/DRVConfig/MiniSQL/Makefile.am 2009-12-11 11:54:07.000000000 -0500
|
||||
+++ unixODBC-2.3.1/DRVConfig/MiniSQL/Makefile.am 2011-12-02 14:00:40.257679498 -0500
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
INCLUDES = -I@top_srcdir@/include $(LTDLINCL)
|
||||
|
||||
-libodbcminiS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module
|
||||
+libodbcminiS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module
|
||||
|
||||
libodbcminiS_la_SOURCES = odbcminiS.c
|
||||
|
||||
diff -Naur unixODBC-2.3.1.orig/DRVConfig/MySQL/Makefile.am unixODBC-2.3.1/DRVConfig/MySQL/Makefile.am
|
||||
--- unixODBC-2.3.1.orig/DRVConfig/MySQL/Makefile.am 2009-12-11 11:54:07.000000000 -0500
|
||||
+++ unixODBC-2.3.1/DRVConfig/MySQL/Makefile.am 2011-12-02 14:00:46.656773720 -0500
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
INCLUDES = -I@top_srcdir@/include $(LTDLINCL)
|
||||
|
||||
-libodbcmyS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module
|
||||
+libodbcmyS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module
|
||||
|
||||
libodbcmyS_la_SOURCES = odbcmyS.c
|
||||
|
||||
diff -Naur unixODBC-2.3.1.orig/DRVConfig/Oracle/Makefile.am unixODBC-2.3.1/DRVConfig/Oracle/Makefile.am
|
||||
--- unixODBC-2.3.1.orig/DRVConfig/Oracle/Makefile.am 2009-12-11 11:54:07.000000000 -0500
|
||||
+++ unixODBC-2.3.1/DRVConfig/Oracle/Makefile.am 2011-12-02 14:00:49.946821471 -0500
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
INCLUDES = -I@top_srcdir@/include $(LTDLINCL)
|
||||
|
||||
-liboraodbcS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module
|
||||
+liboraodbcS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module
|
||||
|
||||
liboraodbcS_la_SOURCES = oraodbcS.c
|
||||
|
||||
diff -Naur unixODBC-2.3.1.orig/DRVConfig/PostgreSQL/Makefile.am unixODBC-2.3.1/DRVConfig/PostgreSQL/Makefile.am
|
||||
--- unixODBC-2.3.1.orig/DRVConfig/PostgreSQL/Makefile.am 2009-12-11 11:54:07.000000000 -0500
|
||||
+++ unixODBC-2.3.1/DRVConfig/PostgreSQL/Makefile.am 2011-12-02 14:00:29.193516374 -0500
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
INCLUDES = -I@top_srcdir@/include $(LTDLINCL)
|
||||
|
||||
-libodbcpsqlS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module
|
||||
+libodbcpsqlS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module
|
||||
|
||||
libodbcpsqlS_la_SOURCES = odbcpsqlS.c
|
||||
|
||||
diff -Naur unixODBC-2.3.1.orig/DRVConfig/drvcfg1/Makefile.am unixODBC-2.3.1/DRVConfig/drvcfg1/Makefile.am
|
||||
--- unixODBC-2.3.1.orig/DRVConfig/drvcfg1/Makefile.am 2009-12-11 11:54:07.000000000 -0500
|
||||
+++ unixODBC-2.3.1/DRVConfig/drvcfg1/Makefile.am 2011-12-02 14:00:53.361871162 -0500
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
INCLUDES = -I@top_srcdir@/include $(LTDLINCL)
|
||||
|
||||
-libodbcdrvcfg1S_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module
|
||||
+libodbcdrvcfg1S_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module
|
||||
|
||||
libodbcdrvcfg1S_la_SOURCES = drvcfg1.c
|
||||
|
||||
diff -Naur unixODBC-2.3.1.orig/DRVConfig/drvcfg2/Makefile.am unixODBC-2.3.1/DRVConfig/drvcfg2/Makefile.am
|
||||
--- unixODBC-2.3.1.orig/DRVConfig/drvcfg2/Makefile.am 2009-12-11 11:54:07.000000000 -0500
|
||||
+++ unixODBC-2.3.1/DRVConfig/drvcfg2/Makefile.am 2011-12-02 14:00:25.249459261 -0500
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
INCLUDES = -I@top_srcdir@/include $(LTDLINCL)
|
||||
|
||||
-libodbcdrvcfg2S_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module
|
||||
+libodbcdrvcfg2S_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module
|
||||
|
||||
libodbcdrvcfg2S_la_SOURCES = drvcfg2.c
|
||||
|
||||
diff -Naur unixODBC-2.3.1.orig/DRVConfig/esoob/Makefile.am unixODBC-2.3.1/DRVConfig/esoob/Makefile.am
|
||||
--- unixODBC-2.3.1.orig/DRVConfig/esoob/Makefile.am 2009-12-11 11:54:07.000000000 -0500
|
||||
+++ unixODBC-2.3.1/DRVConfig/esoob/Makefile.am 2011-12-02 14:00:36.802629045 -0500
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
INCLUDES = -I@top_srcdir@/include $(LTDLINCL)
|
||||
|
||||
-libesoobS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module
|
||||
+libesoobS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module
|
||||
|
||||
libesoobS_la_SOURCES = esoobS.c
|
||||
|
||||
diff -Naur unixODBC-2.3.1.orig/DRVConfig/nn/Makefile.am unixODBC-2.3.1/DRVConfig/nn/Makefile.am
|
||||
--- unixODBC-2.3.1.orig/DRVConfig/nn/Makefile.am 2009-12-11 11:54:07.000000000 -0500
|
||||
+++ unixODBC-2.3.1/DRVConfig/nn/Makefile.am 2011-12-02 14:00:16.113323779 -0500
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
INCLUDES = -I@top_srcdir@/include $(LTDLINCL)
|
||||
|
||||
-libodbcnnS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module
|
||||
+libodbcnnS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module
|
||||
|
||||
libodbcnnS_la_SOURCES = drvcfg.c
|
||||
|
||||
diff -Naur unixODBC-2.3.1.orig/DRVConfig/oplodbc/Makefile.am unixODBC-2.3.1/DRVConfig/oplodbc/Makefile.am
|
||||
--- unixODBC-2.3.1.orig/DRVConfig/oplodbc/Makefile.am 2009-12-11 11:54:07.000000000 -0500
|
||||
+++ unixODBC-2.3.1/DRVConfig/oplodbc/Makefile.am 2011-12-02 14:00:20.992397039 -0500
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
INCLUDES = -I@top_srcdir@/include $(LTDLINCL)
|
||||
|
||||
-liboplodbcS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module
|
||||
+liboplodbcS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module
|
||||
|
||||
liboplodbcS_la_SOURCES = oplodbc.c
|
||||
|
||||
diff -Naur unixODBC-2.3.1.orig/DRVConfig/sapdb/Makefile.am unixODBC-2.3.1/DRVConfig/sapdb/Makefile.am
|
||||
--- unixODBC-2.3.1.orig/DRVConfig/sapdb/Makefile.am 2009-12-11 11:54:07.000000000 -0500
|
||||
+++ unixODBC-2.3.1/DRVConfig/sapdb/Makefile.am 2011-12-02 14:00:43.360724987 -0500
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
INCLUDES = -I@top_srcdir@/include $(LTDLINCL)
|
||||
|
||||
-libsapdbS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module
|
||||
+libsapdbS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module
|
||||
|
||||
libsapdbS_la_SOURCES = sapdb.c
|
||||
|
||||
diff -Naur unixODBC-2.3.1.orig/DRVConfig/tds/Makefile.am unixODBC-2.3.1/DRVConfig/tds/Makefile.am
|
||||
--- unixODBC-2.3.1.orig/DRVConfig/tds/Makefile.am 2009-12-11 11:54:07.000000000 -0500
|
||||
+++ unixODBC-2.3.1/DRVConfig/tds/Makefile.am 2011-12-02 14:00:56.753921152 -0500
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
INCLUDES = -I@top_srcdir@/include $(LTDLINCL)
|
||||
|
||||
-libtdsS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module
|
||||
+libtdsS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module
|
||||
|
||||
libtdsS_la_SOURCES = tdsS.c
|
||||
|
||||
diff -Naur unixODBC-2.3.1.orig/DRVConfig/txt/Makefile.am unixODBC-2.3.1/DRVConfig/txt/Makefile.am
|
||||
--- unixODBC-2.3.1.orig/DRVConfig/txt/Makefile.am 2009-12-11 11:54:07.000000000 -0500
|
||||
+++ unixODBC-2.3.1/DRVConfig/txt/Makefile.am 2011-12-02 14:00:32.929572613 -0500
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
INCLUDES = -I@top_srcdir@/include $(LTDLINCL)
|
||||
|
||||
-libodbctxtS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module
|
||||
+libodbctxtS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module
|
||||
|
||||
libodbctxtS_la_SOURCES = drvcfg.c
|
||||
|
||||
diff -Naur unixODBC-2.3.1.orig/Drivers/MiniSQL/Makefile.am unixODBC-2.3.1/Drivers/MiniSQL/Makefile.am
|
||||
--- unixODBC-2.3.1.orig/Drivers/MiniSQL/Makefile.am 2009-12-11 11:54:09.000000000 -0500
|
||||
+++ unixODBC-2.3.1/Drivers/MiniSQL/Makefile.am 2011-12-02 14:01:30.797419661 -0500
|
||||
@@ -193,6 +193,6 @@
|
||||
sqlFreeEnv.c \
|
||||
sqlFreeStmt.c
|
||||
diff -up unixODBC-2.3.3/Drivers/MiniSQL/Makefile.am.soname unixODBC-2.3.3/Drivers/MiniSQL/Makefile.am
|
||||
--- unixODBC-2.3.3/Drivers/MiniSQL/Makefile.am.soname 2015-08-22 18:39:16.000000000 +0200
|
||||
+++ unixODBC-2.3.3/Drivers/MiniSQL/Makefile.am 2015-08-25 12:27:47.005775376 +0200
|
||||
@@ -193,6 +193,6 @@ EXTRA_DIST = \
|
||||
_sqlFreeEnv.c \
|
||||
_sqlFreeStmt.c
|
||||
|
||||
-libodbcmini_la_LDFLAGS = -no-undefined -version-info 1:0:0 \
|
||||
+libodbcmini_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) \
|
||||
-L@msql_libraries@ -lmsql -module
|
||||
|
||||
diff -Naur unixODBC-2.3.1.orig/Drivers/Postgre7.1/Makefile.am unixODBC-2.3.1/Drivers/Postgre7.1/Makefile.am
|
||||
--- unixODBC-2.3.1.orig/Drivers/Postgre7.1/Makefile.am 2009-12-11 11:54:08.000000000 -0500
|
||||
+++ unixODBC-2.3.1/Drivers/Postgre7.1/Makefile.am 2011-12-02 14:01:24.860333250 -0500
|
||||
@@ -3,7 +3,7 @@
|
||||
INCLUDES = -I@top_srcdir@/include $(LTDLINCL)
|
||||
diff -up unixODBC-2.3.3/Drivers/nn/Makefile.am.soname unixODBC-2.3.3/Drivers/nn/Makefile.am
|
||||
--- unixODBC-2.3.3/Drivers/nn/Makefile.am.soname 2014-05-05 10:27:13.000000000 +0200
|
||||
+++ unixODBC-2.3.3/Drivers/nn/Makefile.am 2015-08-25 12:27:47.007775386 +0200
|
||||
@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libnn.la
|
||||
|
||||
AM_CPPFLAGS = -I@top_srcdir@/include -I.
|
||||
|
||||
-libnn_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module
|
||||
+libnn_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module
|
||||
|
||||
EXTRA_DIST = \
|
||||
nnconfig.h \
|
||||
diff -up unixODBC-2.3.3/Drivers/Postgre7.1/Makefile.am.soname unixODBC-2.3.3/Drivers/Postgre7.1/Makefile.am
|
||||
--- unixODBC-2.3.3/Drivers/Postgre7.1/Makefile.am.soname 2014-05-05 10:27:13.000000000 +0200
|
||||
+++ unixODBC-2.3.3/Drivers/Postgre7.1/Makefile.am 2015-08-25 12:27:47.009775396 +0200
|
||||
@@ -3,7 +3,7 @@ lib_LTLIBRARIES = libodbcpsql.la
|
||||
AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL)
|
||||
|
||||
libodbcpsql_la_LDFLAGS = \
|
||||
- -version-info 2:0:0 \
|
||||
@ -181,27 +36,171 @@ diff -Naur unixODBC-2.3.1.orig/Drivers/Postgre7.1/Makefile.am unixODBC-2.3.1/Dri
|
||||
-no-undefined \
|
||||
$(LIBSOCKET) $(LIBNSL) \
|
||||
-export-dynamic \
|
||||
diff -Naur unixODBC-2.3.1.orig/Drivers/nn/Makefile.am unixODBC-2.3.1/Drivers/nn/Makefile.am
|
||||
--- unixODBC-2.3.1.orig/Drivers/nn/Makefile.am 2009-12-11 11:54:09.000000000 -0500
|
||||
+++ unixODBC-2.3.1/Drivers/nn/Makefile.am 2011-12-02 14:01:07.828083493 -0500
|
||||
@@ -2,7 +2,7 @@
|
||||
diff -up unixODBC-2.3.3/Drivers/template/Makefile.am.soname unixODBC-2.3.3/Drivers/template/Makefile.am
|
||||
--- unixODBC-2.3.3/Drivers/template/Makefile.am.soname 2014-05-05 10:27:13.000000000 +0200
|
||||
+++ unixODBC-2.3.3/Drivers/template/Makefile.am 2015-08-25 12:27:47.012775410 +0200
|
||||
@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libtemplate.la
|
||||
|
||||
INCLUDES = -I@top_srcdir@/include -I.
|
||||
|
||||
-libnn_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module
|
||||
+libnn_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module
|
||||
|
||||
EXTRA_DIST = \
|
||||
nnconfig.h \
|
||||
diff -Naur unixODBC-2.3.1.orig/Drivers/template/Makefile.am unixODBC-2.3.1/Drivers/template/Makefile.am
|
||||
--- unixODBC-2.3.1.orig/Drivers/template/Makefile.am 2009-12-11 11:54:09.000000000 -0500
|
||||
+++ unixODBC-2.3.1/Drivers/template/Makefile.am 2011-12-02 14:01:12.828156445 -0500
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
INCLUDES = -I@top_srcdir@/include -I. $(LTDLINCL)
|
||||
AM_CPPFLAGS = -I@top_srcdir@/include -I. $(LTDLINCL)
|
||||
|
||||
-libtemplate_la_LDFLAGS = -no-undefined -version-info 1:0:0
|
||||
+libtemplate_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION)
|
||||
|
||||
EXTRA_DIST = \
|
||||
driver.h \
|
||||
diff -up unixODBC-2.3.3/DRVConfig/drvcfg1/Makefile.am.soname unixODBC-2.3.3/DRVConfig/drvcfg1/Makefile.am
|
||||
--- unixODBC-2.3.3/DRVConfig/drvcfg1/Makefile.am.soname 2014-05-05 10:26:41.000000000 +0200
|
||||
+++ unixODBC-2.3.3/DRVConfig/drvcfg1/Makefile.am 2015-08-25 12:27:47.014775420 +0200
|
||||
@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libodbcdrvcfg1S.la
|
||||
|
||||
AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL)
|
||||
|
||||
-libodbcdrvcfg1S_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module
|
||||
+libodbcdrvcfg1S_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module
|
||||
|
||||
libodbcdrvcfg1S_la_SOURCES = drvcfg1.c
|
||||
|
||||
diff -up unixODBC-2.3.3/DRVConfig/drvcfg2/Makefile.am.soname unixODBC-2.3.3/DRVConfig/drvcfg2/Makefile.am
|
||||
--- unixODBC-2.3.3/DRVConfig/drvcfg2/Makefile.am.soname 2014-05-05 10:26:41.000000000 +0200
|
||||
+++ unixODBC-2.3.3/DRVConfig/drvcfg2/Makefile.am 2015-08-25 12:27:47.016775430 +0200
|
||||
@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libodbcdrvcfg2S.la
|
||||
|
||||
AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL)
|
||||
|
||||
-libodbcdrvcfg2S_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module
|
||||
+libodbcdrvcfg2S_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module
|
||||
|
||||
libodbcdrvcfg2S_la_SOURCES = drvcfg2.c
|
||||
|
||||
diff -up unixODBC-2.3.3/DRVConfig/esoob/Makefile.am.soname unixODBC-2.3.3/DRVConfig/esoob/Makefile.am
|
||||
--- unixODBC-2.3.3/DRVConfig/esoob/Makefile.am.soname 2014-05-05 10:26:41.000000000 +0200
|
||||
+++ unixODBC-2.3.3/DRVConfig/esoob/Makefile.am 2015-08-25 12:27:47.017775434 +0200
|
||||
@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libesoobS.la
|
||||
|
||||
AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL)
|
||||
|
||||
-libesoobS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module
|
||||
+libesoobS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module
|
||||
|
||||
libesoobS_la_SOURCES = esoobS.c
|
||||
|
||||
diff -up unixODBC-2.3.3/DRVConfig/Mimer/Makefile.am.soname unixODBC-2.3.3/DRVConfig/Mimer/Makefile.am
|
||||
--- unixODBC-2.3.3/DRVConfig/Mimer/Makefile.am.soname 2014-05-05 10:26:41.000000000 +0200
|
||||
+++ unixODBC-2.3.3/DRVConfig/Mimer/Makefile.am 2015-08-25 12:27:47.019775444 +0200
|
||||
@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libmimerS.la
|
||||
|
||||
AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL)
|
||||
|
||||
-libmimerS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module
|
||||
+libmimerS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module
|
||||
|
||||
libmimerS_la_SOURCES = mimerS.c
|
||||
|
||||
diff -up unixODBC-2.3.3/DRVConfig/MiniSQL/Makefile.am.soname unixODBC-2.3.3/DRVConfig/MiniSQL/Makefile.am
|
||||
--- unixODBC-2.3.3/DRVConfig/MiniSQL/Makefile.am.soname 2014-05-05 10:26:41.000000000 +0200
|
||||
+++ unixODBC-2.3.3/DRVConfig/MiniSQL/Makefile.am 2015-08-25 12:27:47.020775449 +0200
|
||||
@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libodbcminiS.la
|
||||
|
||||
AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL)
|
||||
|
||||
-libodbcminiS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module
|
||||
+libodbcminiS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module
|
||||
|
||||
libodbcminiS_la_SOURCES = odbcminiS.c
|
||||
|
||||
diff -up unixODBC-2.3.3/DRVConfig/MySQL/Makefile.am.soname unixODBC-2.3.3/DRVConfig/MySQL/Makefile.am
|
||||
--- unixODBC-2.3.3/DRVConfig/MySQL/Makefile.am.soname 2014-05-05 10:26:41.000000000 +0200
|
||||
+++ unixODBC-2.3.3/DRVConfig/MySQL/Makefile.am 2015-08-25 12:27:47.023775464 +0200
|
||||
@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libodbcmyS.la
|
||||
|
||||
AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL)
|
||||
|
||||
-libodbcmyS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module
|
||||
+libodbcmyS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module
|
||||
|
||||
libodbcmyS_la_SOURCES = odbcmyS.c
|
||||
|
||||
diff -up unixODBC-2.3.3/DRVConfig/nn/Makefile.am.soname unixODBC-2.3.3/DRVConfig/nn/Makefile.am
|
||||
--- unixODBC-2.3.3/DRVConfig/nn/Makefile.am.soname 2014-05-05 10:26:41.000000000 +0200
|
||||
+++ unixODBC-2.3.3/DRVConfig/nn/Makefile.am 2015-08-25 12:27:47.024775469 +0200
|
||||
@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libodbcnnS.la
|
||||
|
||||
AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL)
|
||||
|
||||
-libodbcnnS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module
|
||||
+libodbcnnS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module
|
||||
|
||||
libodbcnnS_la_SOURCES = drvcfg.c
|
||||
|
||||
diff -up unixODBC-2.3.3/DRVConfig/oplodbc/Makefile.am.soname unixODBC-2.3.3/DRVConfig/oplodbc/Makefile.am
|
||||
--- unixODBC-2.3.3/DRVConfig/oplodbc/Makefile.am.soname 2014-05-05 10:26:41.000000000 +0200
|
||||
+++ unixODBC-2.3.3/DRVConfig/oplodbc/Makefile.am 2015-08-25 12:27:47.026775478 +0200
|
||||
@@ -2,7 +2,7 @@ lib_LTLIBRARIES = liboplodbcS.la
|
||||
|
||||
AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL)
|
||||
|
||||
-liboplodbcS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module
|
||||
+liboplodbcS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module
|
||||
|
||||
liboplodbcS_la_SOURCES = oplodbc.c
|
||||
|
||||
diff -up unixODBC-2.3.3/DRVConfig/Oracle/Makefile.am.soname unixODBC-2.3.3/DRVConfig/Oracle/Makefile.am
|
||||
--- unixODBC-2.3.3/DRVConfig/Oracle/Makefile.am.soname 2014-05-05 10:26:41.000000000 +0200
|
||||
+++ unixODBC-2.3.3/DRVConfig/Oracle/Makefile.am 2015-08-25 12:27:47.027775483 +0200
|
||||
@@ -2,7 +2,7 @@ lib_LTLIBRARIES = liboraodbcS.la
|
||||
|
||||
AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL)
|
||||
|
||||
-liboraodbcS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module
|
||||
+liboraodbcS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module
|
||||
|
||||
liboraodbcS_la_SOURCES = oraodbcS.c
|
||||
|
||||
diff -up unixODBC-2.3.3/DRVConfig/PostgreSQL/Makefile.am.soname unixODBC-2.3.3/DRVConfig/PostgreSQL/Makefile.am
|
||||
--- unixODBC-2.3.3/DRVConfig/PostgreSQL/Makefile.am.soname 2014-05-05 10:26:41.000000000 +0200
|
||||
+++ unixODBC-2.3.3/DRVConfig/PostgreSQL/Makefile.am 2015-08-25 12:27:47.029775493 +0200
|
||||
@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libodbcpsqlS.la
|
||||
|
||||
AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL)
|
||||
|
||||
-libodbcpsqlS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module
|
||||
+libodbcpsqlS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module
|
||||
|
||||
libodbcpsqlS_la_SOURCES = odbcpsqlS.c
|
||||
|
||||
diff -up unixODBC-2.3.3/DRVConfig/sapdb/Makefile.am.soname unixODBC-2.3.3/DRVConfig/sapdb/Makefile.am
|
||||
--- unixODBC-2.3.3/DRVConfig/sapdb/Makefile.am.soname 2014-05-05 10:26:41.000000000 +0200
|
||||
+++ unixODBC-2.3.3/DRVConfig/sapdb/Makefile.am 2015-08-25 12:27:47.031775503 +0200
|
||||
@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libsapdbS.la
|
||||
|
||||
AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL)
|
||||
|
||||
-libsapdbS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module
|
||||
+libsapdbS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module
|
||||
|
||||
libsapdbS_la_SOURCES = sapdb.c
|
||||
|
||||
diff -up unixODBC-2.3.3/DRVConfig/tds/Makefile.am.soname unixODBC-2.3.3/DRVConfig/tds/Makefile.am
|
||||
--- unixODBC-2.3.3/DRVConfig/tds/Makefile.am.soname 2014-05-05 10:26:41.000000000 +0200
|
||||
+++ unixODBC-2.3.3/DRVConfig/tds/Makefile.am 2015-08-25 12:27:47.032775507 +0200
|
||||
@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libtdsS.la
|
||||
|
||||
AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL)
|
||||
|
||||
-libtdsS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module
|
||||
+libtdsS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module
|
||||
|
||||
libtdsS_la_SOURCES = tdsS.c
|
||||
|
||||
diff -up unixODBC-2.3.3/DRVConfig/txt/Makefile.am.soname unixODBC-2.3.3/DRVConfig/txt/Makefile.am
|
||||
--- unixODBC-2.3.3/DRVConfig/txt/Makefile.am.soname 2014-05-05 10:26:41.000000000 +0200
|
||||
+++ unixODBC-2.3.3/DRVConfig/txt/Makefile.am 2015-08-25 12:27:47.034775517 +0200
|
||||
@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libodbctxtS.la
|
||||
|
||||
AM_CPPFLAGS = -I@top_srcdir@/include $(LTDLINCL)
|
||||
|
||||
-libodbctxtS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module
|
||||
+libodbctxtS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module
|
||||
|
||||
libodbctxtS_la_SOURCES = drvcfg.c
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
5e4528851eda5d3d4aed249b669bd05b unixODBC-2.3.2.tar.gz
|
||||
09bf65123905b951af192854d70eeae8 unixODBC-2.3.3.tar.gz
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
diff -up unixODBC-2.3.2/Makefile.am.old unixODBC-2.3.2/Makefile.am
|
||||
--- unixODBC-2.3.2/Makefile.am.old 2015-08-11 10:45:46.340429001 +0200
|
||||
+++ unixODBC-2.3.2/Makefile.am 2015-08-11 10:45:51.532454100 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-ACLOCAL_AMFLAGS=-I libltdl/m4
|
||||
+ACLOCAL_AMFLAGS=-I m4
|
||||
|
||||
SUBDIRS = \
|
||||
extras \
|
||||
diff -up unixODBC-2.3.2/configure.in.old unixODBC-2.3.2/configure.in
|
||||
--- unixODBC-2.3.2/configure.in.old 2015-08-11 10:56:05.899423880 +0200
|
||||
+++ unixODBC-2.3.2/configure.in 2015-08-11 10:56:12.701456758 +0200
|
||||
@@ -133,7 +133,7 @@ LIBLTDL=""
|
||||
AC_LIBTOOL_WIN32_DLL
|
||||
dnl AC_PROG_LIBTOOL
|
||||
|
||||
-AC_CONFIG_MACRO_DIR([libltdl/m4])
|
||||
+dnl AC_CONFIG_MACRO_DIR([libltdl/m4])
|
||||
dnl LT_CONFIG_LTDL_DIR([libltdl])
|
||||
dnl LTDL_INIT
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
--- unixODBC-2.3.2/man/isql.1 2013-07-04 15:32:06.000000000 +0200
|
||||
+++ unixODBC-2.3.2/man/isql.1.new 2014-02-18 10:06:43.913129715 +0100
|
||||
@@ -1,8 +1,7 @@
|
||||
-\" vim:language en_US.UTF-8:
|
||||
.TH isql 1 "Tue 25 Jun 2013" "version 2.3.2" "UnixODBC manual pages"
|
||||
|
||||
.SH NAME
|
||||
-isql - unixODBC command-line interactive SQL tool
|
||||
+isql, iusql \- unixODBC command-line interactive SQL tool
|
||||
|
||||
.SH SYNOPSIS
|
||||
\fBisql\fR \fIDSN\fR [\fIUSER\fR [\fIPASSWORD\fR]] [\fIoptions\fR]
|
||||
@@ -13,6 +12,9 @@
|
||||
or interactively. It has some interesting options such as an option to generate
|
||||
output wrapped in an HTML table.
|
||||
|
||||
+.B iusql
|
||||
+is the same tool with built-in Unicode support.
|
||||
+
|
||||
.SH ARGUMENTS
|
||||
|
||||
.IP \fBDSN\fR
|
||||
52
unixODBC.7
52
unixODBC.7
@ -1,52 +0,0 @@
|
||||
.TH unixODBC 7 "Tue 22. Oct 2013" "version 2.3.2" "unixODBC manual pages"
|
||||
|
||||
.SH NAME
|
||||
unixODBC \- An ODBC implementation for Unix
|
||||
|
||||
.SH DESCRIPTION
|
||||
ODBC is an open specification for providing application developers with a
|
||||
predictable API with which to access Data Sources. Data Sources include SQL
|
||||
Servers and any Data Source with an ODBC Driver.
|
||||
|
||||
The unixODBC Project goals are to develop and promote unixODBC to be the
|
||||
definitive standard for ODBC on non MS Windows platforms.
|
||||
|
||||
.SH ENVIRONMENT VARIABLES
|
||||
|
||||
.IP \fBODBCSYSINI
|
||||
Overloads path to unixODBC configuration files. By default equals to '/etc'.
|
||||
|
||||
.IP \fBODBCINSTINI
|
||||
Overloads the name of the drivers configuration file. It is relative to
|
||||
\fBODBCSYSINI\fR and by default set to 'odbcinst.ini'.
|
||||
|
||||
.IP \fBODBCINSTUI
|
||||
Overloads the library name for UI. The final name that is searched for is
|
||||
evaluated as "lib$ODBCINSTUI". By default it is set to 'odbcinstQ4', so
|
||||
the resulting library name is 'libodbcinstQ4'.
|
||||
|
||||
.IP \fBODBCSEARCH
|
||||
Overloads the configuration mode and determines where to look for configuration
|
||||
files. Must be set to one of ODBC_SYSTEM_DSN, ODBC_USER_DSN or ODBC_BOTH_DSN
|
||||
(the last one is the default value).
|
||||
|
||||
.IP \fBODBCINI
|
||||
Overloads the path to user configuration file. By default it is set
|
||||
to "~/.odbc.ini".
|
||||
|
||||
.SH SEE ALSO
|
||||
.BR isql (1),
|
||||
.BR odbcinst (1),
|
||||
.BR odbc.ini (5),
|
||||
.BR odbcinst.ini (5)
|
||||
|
||||
.SH AUTHORS
|
||||
|
||||
The authors of unixODBC are Peter Harvey <\fIpharvey@codebydesign.com\fR> and
|
||||
Nick Gorham <\fInick@easysoft.com\fR>. For the full list of contributors see the
|
||||
AUTHORS file.
|
||||
|
||||
.SH COPYRIGHT
|
||||
|
||||
unixODBC is licensed under the GNU Lesser General Public License. For details
|
||||
about the license, see the COPYING file.
|
||||
@ -1,7 +1,7 @@
|
||||
Summary: A complete ODBC driver manager for Linux
|
||||
Name: unixODBC
|
||||
Version: 2.3.2
|
||||
Release: 8%{?dist}
|
||||
Version: 2.3.3
|
||||
Release: 1%{?dist}
|
||||
Group: System Environment/Libraries
|
||||
URL: http://www.unixODBC.org/
|
||||
# Programs are GPL, libraries are LGPL, except News Server library is GPL.
|
||||
@ -11,17 +11,10 @@ Source: http://www.unixODBC.org/%{name}-%{version}.tar.gz
|
||||
Source1: odbcinst.ini
|
||||
Source4: conffile.h
|
||||
Source5: README.dist
|
||||
Source6: iusql.1
|
||||
Source7: dltest.1
|
||||
Source8: odbc_config.1
|
||||
Source9: unixODBC.7
|
||||
|
||||
Patch1: depcomp.patch
|
||||
Patch6: export-symbols.patch
|
||||
Patch8: so-version-bump.patch
|
||||
Patch9: keep-typedefs.patch
|
||||
Patch10: unixODBC-isql.1.patch
|
||||
Patch11: unixODBC-2.3.2-autotools.patch
|
||||
|
||||
Conflicts: iodbc
|
||||
|
||||
@ -45,12 +38,9 @@ ODBC, you need to install this package.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1
|
||||
%patch6 -p1
|
||||
%patch8 -p1
|
||||
%patch8 -p1 -b .soname-bump
|
||||
%patch9 -p1
|
||||
%patch10 -p1
|
||||
%patch11 -p1 -b .autotools
|
||||
|
||||
chmod 0644 Drivers/MiniSQL/*.c
|
||||
chmod 0644 Drivers/nn/*.c
|
||||
@ -79,6 +69,11 @@ export CFLAGS CXXFLAGS
|
||||
|
||||
%configure --with-gnu-ld=yes --enable-threads=yes \
|
||||
--enable-drivers=yes --enable-driverc=yes --enable-ltdllib
|
||||
|
||||
# Get rid of the rpaths
|
||||
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
|
||||
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
|
||||
|
||||
make all
|
||||
|
||||
%install
|
||||
@ -132,12 +127,6 @@ do
|
||||
mv -f devel-so-list.x devel-so-list
|
||||
done
|
||||
|
||||
# install man pages that are not part of the upstream yet
|
||||
install -Dm644 %{SOURCE6} $RPM_BUILD_ROOT%{_mandir}/man1/iusql.1
|
||||
install -Dm644 %{SOURCE7} $RPM_BUILD_ROOT%{_mandir}/man1/dltest.1
|
||||
install -Dm644 %{SOURCE8} $RPM_BUILD_ROOT%{_mandir}/man1/odbc_config.1
|
||||
install -Dm644 %{SOURCE9} $RPM_BUILD_ROOT%{_mandir}/man7/unixODBC.7
|
||||
|
||||
%files -f base-so-list
|
||||
%doc README COPYING AUTHORS ChangeLog NEWS doc
|
||||
%doc README.dist
|
||||
@ -157,6 +146,11 @@ install -Dm644 %{SOURCE9} $RPM_BUILD_ROOT%{_mandir}/man7/unixODBC.7
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
%changelog
|
||||
* Tue Aug 25 2015 Jan Stanek <jstanek@redhat.com> - 2.3.3-1
|
||||
- Update to version 2.3.3
|
||||
- Removed patches and sources included upstream
|
||||
- Recreated so-version-bump.patch
|
||||
|
||||
* Wed Aug 12 2015 Jan Stanek <jstanek@redhat.com> - 2.3.2-8
|
||||
- Backported changes necessary for building with new autotools version.
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user