[macports-ports] branch master updated: libiodbc: provide variant for extra libodbc.so library

[Ryan Schmidt]

On May 7, 2018, at 10:39, Jeremy L wrote:

> Jeremy L (nerdling) pushed a commit to branch master
> in repository macports-ports.
> 
> 
> https://github.com/macports/macports-ports/commit/c175b9ba889d42decf33b787906eb70801265031
> 
> The following commit(s) were added to refs/heads/master by this push:
> 
>      new c175b9b  libiodbc: provide variant for extra libodbc.so library
> 
> c175b9b is described below
> 
> 
> commit c175b9ba889d42decf33b787906eb70801265031
> 
> Author: Jeremy Lavergne
> AuthorDate: Mon May 7 11:39:28 2018 -0400
> 
> 
>     libiodbc: provide variant for extra libodbc.so library
>     
>     Fixes trac 55661

Don't forget to refer to Trac tickets in Git commit messages by their absolute URL, so that Trac can automatically close tickets for you.


> diff --git a/devel/libiodbc/Portfile b/devel/libiodbc/Portfile
> index 411c695..1de9a3b 100644
> --- a/devel/libiodbc/Portfile
> +++ b/devel/libiodbc/Portfile
> @@ -7,7 +7,7 @@ PortGroup           active_variants 1.1
>  github.setup        openlink iODBC 3.52.12 v
>  #override name (keep it lowercase)
>  name                libiodbc
> -conflicts           unixODBC
> +revision            1
>  categories          devel
>  maintainers         {snc @nerdling} openmaintainer
>  license             BSD
> @@ -26,6 +26,12 @@ depends_build-append    port:automake \
>  
>  patchfiles-append   patch-iodbcinst-unicode.h.diff
>  
> +configure.args-append   --disable-libodbc
> +
> +variant libodbc description {install extra libodbc.so library} {
> +    configure.args-replace --disable-libodbc --enable-libodbc
> +}

This variant appears to install the file libodbc.a, not libodbc.so.

The variant needs to contain the "conflicts unixODBC" line, doesn't it?

The unixODBC port still declares that it conflicts with libiodbc. Now it only conflicts with libiodbc if the libodbc variant is used, but we don't have a syntax for specifying that directly. The simplest workaround I can think of, which we've used in a few other ports, is to declare the conflict in unixODBC only if the libodbc.a file exists on disk.


> @@ -54,7 +60,7 @@ variant x11 {
>      configure.args-delete   --disable-gui
>  }
>  
> -default_variants +x11
> +default_variants +x11 +libiodbc

Typo: the variant name is libodbc, not libiodbc.