diff options
| author |   Keri Harris <keri@gentoo.org> | 2007-01-29 06:45:05 +0000 |
|---|---|---|
| committer | Keri Harris <keri@gentoo.org> | 2007-01-29 06:45:05 +0000 |
| commit | a48b3a0b83506e70b1886be0aa950d21f9ff73ee (patch) | |
| tree | 4962a0db686de8a1842c5d74fc7e3e31ebf3ed1c /dev-lang/xsb | |
| parent | stable for x86 (diff) | |
| download | gentoo-2-a48b3a0b83506e70b1886be0aa950d21f9ff73ee.tar.gz gentoo-2-a48b3a0b83506e70b1886be0aa950d21f9ff73ee.tar.bz2 gentoo-2-a48b3a0b83506e70b1886be0aa950d21f9ff73ee.zip | |
Enable use of iODBC driver manager without explicit support for ODBC.
(Portage version: 2.1.2-r4)
Diffstat (limited to 'dev-lang/xsb')
| -rw-r--r-- | dev-lang/xsb/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-lang/xsb/files/xsb-3.0.1-configure.patch | 27 |
2 files changed, 24 insertions, 8 deletions
diff --git a/dev-lang/xsb/ChangeLog b/dev-lang/xsb/ChangeLog index ae4e4e0eaecb..a5d138a97947 100644 --- a/dev-lang/xsb/ChangeLog +++ b/dev-lang/xsb/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-lang/xsb # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/xsb/ChangeLog,v 1.1 2007/01/28 09:19:36 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/xsb/ChangeLog,v 1.2 2007/01/29 06:45:05 keri Exp $ + + 29 Jan 2007; keri <keri@gentoo.org> files/xsb-3.0.1-configure.patch: + Enable use of iODBC driver manager without explicit support for ODBC. *xsb-3.0.1 (28 Jan 2007) diff --git a/dev-lang/xsb/files/xsb-3.0.1-configure.patch b/dev-lang/xsb/files/xsb-3.0.1-configure.patch index a4cf79cbd1b3..902761faec15 100644 --- a/dev-lang/xsb/files/xsb-3.0.1-configure.patch +++ b/dev-lang/xsb/files/xsb-3.0.1-configure.patch @@ -1,5 +1,5 @@ --- XSB.orig/build/configure.in 2006-06-25 13:08:48.000000000 +1200 -+++ XSB/build/configure.in 2007-01-28 12:01:01.000000000 +1300 ++++ XSB/build/configure.in 2007-01-29 19:38:38.000000000 +1300 @@ -258,9 +258,9 @@ dnl prefix given by the user. The prefix variable will later get dnl the <xsb-version> subdirectory added in. @@ -147,22 +147,35 @@ if test "${java_support}" != "yes"; then echo "Interprolog not supported due to failure to find Java" with_interprolog="" -@@ -1553,11 +1556,11 @@ +@@ -1547,20 +1550,20 @@ + #fi + + # dnl ODBC library +-if test "${with_odbc}" = yes ; then ++#if test "${with_odbc}" = yes ; then + case "$canonical" in + *-cygwin*) LDFLAGS="-lodbc32 ${LDFLAGS}" LINKFLAGS="-lodbc32 ${LINKFLAGS}" ;; - *) if test -n "${with_iodbc}"; then +- *) if test -n "${with_iodbc}"; then - LDFLAGS="-liodbc ${LDFLAGS}" - LINKFLAGS="-liodbc ${LINKFLAGS}" -+ LDFLAGS="$(iodbc-config --libs) ${LDFLAGS}" -+# LINKFLAGS="-liodbc ${LINKFLAGS}" - else +- else - LDFLAGS="-lodbc ${LDFLAGS}" - LINKFLAGS="-lodbc ${LINKFLAGS}" ++ *) if test "${with_iodbc}" = "yes"; then ++ LDFLAGS="$(iodbc-config --libs) ${LDFLAGS}" ++# LINKFLAGS="-liodbc ${LINKFLAGS}" ++ elif test "${with_odbc}" = "yes"; then + LDFLAGS="$(odbc_config --libs) ${LDFLAGS}" +# LINKFLAGS="-lodbc ${LINKFLAGS}" fi esac - fi +-fi ++#fi + + # this is needed for -mno-cygwin dll compilation + DLLTYPE=nodll @@ -1726,11 +1729,11 @@ AC_SUBST(xsb_asm_extension) AC_SUBST(xsb_dcl_extension) |