[macports-ports] 02/02: xrootd: use cmake 1.1 PG. Update compiler settings. Removing force use of libc++.

[mf2k at macports.org]

Hi Chris,



> On Jan 24, 2019, at 2:47 PM, Chris Jones <jonesc at hep.phy.cam.ac.uk> wrote:
> 
> Chris Jones (cjones051073) pushed a commit to branch master
> in repository macports-ports.
> 
> https://github.com/macports/macports-ports/commit/9cf3483d656788c57c73cdf66234f43f7e716af3 <https://github.com/macports/macports-ports/commit/9cf3483d656788c57c73cdf66234f43f7e716af3>
> commit 9cf3483d656788c57c73cdf66234f43f7e716af3
> Author: Chris Jones <jonesc at macports.org>
> AuthorDate: Thu Jan 24 21:47:38 2019 +0000
> 
>     xrootd: use cmake 1.1 PG. Update compiler settings. Removing force use of libc++.
> ---
>  science/xrootd/Portfile | 15 ++++++++-------
>  1 file changed, 8 insertions(+), 7 deletions(-)
> 
> diff --git a/science/xrootd/Portfile b/science/xrootd/Portfile
> index 9eafb47..04b38f1 100644
> --- a/science/xrootd/Portfile
> +++ b/science/xrootd/Portfile
> @@ -1,7 +1,7 @@
>  # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
>  
>  PortSystem          1.0
> -PortGroup           cmake 1.0
> +PortGroup           cmake 1.1
>  PortGroup           compiler_blacklist_versions 1.0
>  PortGroup           github 1.0
>  PortGroup           legacysupport 1.0
> @@ -49,19 +49,20 @@ default_variants    +ssl +readline +kerberos
>  
>  cmake.out_of_source yes

This is the default in the cmake 1.1 portgroup and so this line can be removed now. 

>  
> +# Force a compatible compiler
>  compiler.blacklist-append *gcc* {clang < 900} macports-clang-3.3 macports-clang-3.4 \
> -                          macports-clang-3.7 macports-clang-3.9 
> -compiler.whitelist clang macports-clang-6.0 macports-clang-5.0 macports-clang-4.0
> +                          macports-clang-3.7 macports-clang-4.0 macports-clang-3.9
> +compiler.whitelist clang macports-clang-7.0 macports-clang-6.0 macports-clang-5.0
>  
>  # Note that we are forcing this choice. This means that anything linking
>  # against root6 needs to also be using libc++.  This is possibly
>  # problematic, but luckily there is just a limited set of such dependents.
>  # Another problem is that all dependencies might need to be built-in
>  # to make sure that they all use libc++.
> -if { ${configure.cxx_stdlib} ne "libc++" } {
> -    configure.cxx_stdlib libc++
> -    depends_lib-append port:libcxx
> -}
> +#if { ${configure.cxx_stdlib} ne "libc++" } {
> +#    configure.cxx_stdlib libc++
> +#    depends_lib-append port:libcxx
> +#}
>  
>  configure.args-append -DENABLE_CRYPTO=False \
>                        -DENABLE_READLINE=False \
> 


Cheers!
Frank


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macports.org/pipermail/macports-dev/attachments/20190128/eed3e9fd/attachment.html>