diff options
author | bapt <bapt@FreeBSD.org> | 2014-05-06 00:24:00 +0800 |
---|---|---|
committer | bapt <bapt@FreeBSD.org> | 2014-05-06 00:24:00 +0800 |
commit | 602652f5f498977ca9afddad82ce1abd529c8fdb (patch) | |
tree | 111c3e996440f35b3a05e66700954340c9919761 /lang/php55 | |
parent | c7c57f6ff3ff10dcbd4c447d7f21425e9de38302 (diff) | |
download | freebsd-ports-gnome-602652f5f498977ca9afddad82ce1abd529c8fdb.tar.gz freebsd-ports-gnome-602652f5f498977ca9afddad82ce1abd529c8fdb.tar.zst freebsd-ports-gnome-602652f5f498977ca9afddad82ce1abd529c8fdb.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/php55')
-rw-r--r-- | lang/php55/Makefile.ext | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/lang/php55/Makefile.ext b/lang/php55/Makefile.ext index b20f53928454..1e48b4247523 100644 --- a/lang/php55/Makefile.ext +++ b/lang/php55/Makefile.ext @@ -207,10 +207,6 @@ MYSQLND_DESC= Use MySQL Native Driver .if ${PHP_MODNAME} == "odbc" CONFIGURE_ARGS+=--enable-odbc - -OPTIONS_DEFINE= IODBC - -IODBC_DESC= Use the iODBC driver instead of unixODBC .endif .if ${PHP_MODNAME} == "openssl" @@ -263,10 +259,6 @@ USE_PHP_BUILD= yes .endif .if ${PHP_MODNAME} == "pdo_odbc" -OPTIONS_DEFINE= IODBC - -IODBC_DESC= Use the iODBC driver instead of unixODBC - USE_PHP= pdo USE_PHP_BUILD= yes .endif @@ -561,15 +553,8 @@ post-extract: .endif .if ${PHP_MODNAME} == "odbc" -. if ${PORT_OPTIONS:MIODBC} -LIB_DEPENDS+= libiodbc.so:${PORTSDIR}/databases/libiodbc - -CONFIGURE_ARGS+=--with-iodbc=${LOCALBASE} -. else LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC - CONFIGURE_ARGS+=--with-unixODBC=${LOCALBASE} -. endif .endif .if ${PHP_MODNAME} == "pdo_dblib" @@ -581,15 +566,8 @@ LIB_DEPENDS+= libct.so:${PORTSDIR}/databases/freetds .endif .if ${PHP_MODNAME} == "pdo_odbc" -. if ${PORT_OPTIONS:MIODBC} -LIB_DEPENDS+= libiodbc.so:${PORTSDIR}/databases/libiodbc - -CONFIGURE_ARGS+=--with-pdo-odbc=iODBC,${LOCALBASE} -. else LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC - CONFIGURE_ARGS+=--with-pdo-odbc=unixODBC,${LOCALBASE} -. endif .endif .if ${PHP_MODNAME} == "pdo_mysql" |