[macports-ports] branch master updated: gdal: more cleaning up

[Ryan Schmidt]

On May 22, 2018, at 06:41, Vincent wrote:

> Vincent (Veence) pushed a commit to branch master
> in repository macports-ports.
> 
> 
> https://github.com/macports/macports-ports/commit/73f6c980bb02dcd3cda694f6732b45136b4c6a4f
> 
> The following commit(s) were added to refs/heads/master by this push:
> 
>      new 73f6c98  gdal: more cleaning up
> 
> 73f6c98 is described below
> 
> 
> commit 73f6c980bb02dcd3cda694f6732b45136b4c6a4f
> 
> Author: Veence
> AuthorDate: Tue May 22 13:37:49 2018 +0200
> 
> 
>     gdal: more cleaning up
> 
>     
> 
>     * Fix a regression with spatialite
> 
>     * Deletes /usr/local/include from CPPFLAGS
> 
>     * Make some optional drivers mandatory
> 
>     * Try to fix < 10.9 builds failing at link time
> 
> ---
>  gis/gdal/Portfile                       | 51 ++++++++++-----------------------
>  gis/gdal/files/template-ed-GDALmake_opt |  1 +
>  2 files changed, 16 insertions(+), 36 deletions(-)
> 
> 
> diff --git a/gis/gdal/Portfile b/gis/gdal/Portfile
> index a25bc43..3e12866 100644
> --- a/gis/gdal/Portfile
> +++ b/gis/gdal/Portfile


> +    # see https://trac.macports.org/ticket/56517
> +    if {${configure.cxx_stdlib} eq "macports-libstdc++"} {
> +        configure.ldflags-append -stdlib=macports-libstdc++
> +    }

This should be:

if {[string match *clang* ${configure.cxx}]} {
    configure.ldflags-append -stdlib=${configure.cxx_stdlib}
}

Only clang understands the -stdlib flag, but you always want to use it, regardless of what the C++ stdlib is.