diff options
author | Christian Ruppert <idl0r@gentoo.org> | 2011-02-23 20:52:26 +0000 |
---|---|---|
committer | Christian Ruppert <idl0r@gentoo.org> | 2011-02-23 20:52:26 +0000 |
commit | d005472e32a1a7f3b5ac4e856ff992efc88704d8 (patch) | |
tree | b32d03c78f3195c5c1ffb2fe86348c3ecc68aa9f /net-dns/bind/files | |
parent | Version bump (diff) | |
download | gentoo-2-d005472e32a1a7f3b5ac4e856ff992efc88704d8.tar.gz gentoo-2-d005472e32a1a7f3b5ac4e856ff992efc88704d8.tar.bz2 gentoo-2-d005472e32a1a7f3b5ac4e856ff992efc88704d8.zip |
Fix ODBC detection when using dlz & odbc, bug 347621 comment #8, thanks to Agostino Sarubbo <ago@autistici.org>. Remove useless patches from 9.6.3, already applied by upstream.
(Portage version: 2.2.0_alpha25/cvs/Linux x86_64)
Diffstat (limited to 'net-dns/bind/files')
-rw-r--r-- | net-dns/bind/files/bind-9.7.3-odbc-dlz-detect.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/net-dns/bind/files/bind-9.7.3-odbc-dlz-detect.patch b/net-dns/bind/files/bind-9.7.3-odbc-dlz-detect.patch new file mode 100644 index 000000000000..1577d578ddd4 --- /dev/null +++ b/net-dns/bind/files/bind-9.7.3-odbc-dlz-detect.patch @@ -0,0 +1,21 @@ +diff --git a/contrib/dlz/config.dlz.in b/contrib/dlz/config.dlz.in +index ff3783a..bd7a700 100644 +--- a/contrib/dlz/config.dlz.in ++++ b/contrib/dlz/config.dlz.in +@@ -407,10 +407,13 @@ then + odbcdirs="/usr /usr/local /usr/pkg" + for d in $odbcdirs + do +- if test -f $d/include/sql.h -a -f $d/lib/libodbc.a ++ if test -f $d/include/sql.h + then +- use_dlz_odbc=$d +- break ++ if test -f $d/lib/libodbc.a -o -f $d/lib/libodbc.la -o $d/lib/libodbc.so ++ then ++ use_dlz_odbc=$d ++ break ++ fi + fi + done + fi |