diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-05-06 00:24:00 +0800 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-05-06 00:24:00 +0800 |
| commit | f4f46a920e21b409b3f3b16873c6cef1eb4af378 (patch) | |
| tree | 111c3e996440f35b3a05e66700954340c9919761 /lang/swi-pl | |
| parent | 4007e179a6cb2c28428cd709099b5c1ff6b65402 (diff) | |
| download | freebsd-ports-gnome-f4f46a920e21b409b3f3b16873c6cef1eb4af378.tar.gz freebsd-ports-gnome-f4f46a920e21b409b3f3b16873c6cef1eb4af378.tar.zst freebsd-ports-gnome-f4f46a920e21b409b3f3b16873c6cef1eb4af378.zip | |
Fix unixODBC vs libiodbc conflicts
Always rely on unixODBC each time a port is looking for libodbc.so
Remove odbc compat from libiodbc
This allows to install both kde and gnome at the same time
While here:
- Convert libiodbc to USES=libtool
- Convert a bunch of libiodbc dependencies to USES=libtool
- Chase libiodbc.so shlib change
- Stagify some ports
- Convert some ports to USES=pgsql
Discussed with: rakuco (kde)
With hat: portmgr
Diffstat (limited to 'lang/swi-pl')
| -rw-r--r-- | lang/swi-pl/Makefile | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lang/swi-pl/Makefile b/lang/swi-pl/Makefile index 971485ce4a77..695403409351 100644 --- a/lang/swi-pl/Makefile +++ b/lang/swi-pl/Makefile @@ -13,12 +13,8 @@ COMMENT= Edinburgh-style Prolog compiler LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp \ libjpeg.so:${PORTSDIR}/graphics/jpeg -# note that the ports unixodbc and libiodbc conflict -OPTIONS_SINGLE= ODBC -OPTIONS_SINGLE_ODBC= IODBC UNIXODBC -OPTIONS_DEFAULT=UNIXODBC -UNIXODBC_LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/unixODBC -IODBC_LIB_DEPENDS= libiodbc.so:${PORTSDIR}/databases/libiodbc +OPTIONS_DEFINE= ODBC +ODBC_LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/unixODBC CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib |