<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/04d70ec30f0f8010419a94fd8e563d46d560ca28">https://github.com/macports/macports-ports/commit/04d70ec30f0f8010419a94fd8e563d46d560ca28</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 04d70ec30f0f8010419a94fd8e563d46d560ca28
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Apr 21 11:53:06 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> languages PG: whitespace changes
</span>---
_resources/port1.0/group/languages-1.0.tcl | 100 ++++++++++++++---------------
1 file changed, 50 insertions(+), 50 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/languages-1.0.tcl b/_resources/port1.0/group/languages-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 9a456db..48840b7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/languages-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/languages-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,26 +30,26 @@
</span> #
# Usage:
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# PortGroup languages 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# PortGroup languages 1.0
</span> #
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# compiler.c_standard Standard for the C programming language
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Values: 1989 (Default), 1999, 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# compiler.c_standard Standard for the C programming language
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Values: 1989 (Default), 1999, 2011
</span> #
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# compiler.cxx_standard Standard for the C++ programming language
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Values: 1998 (Default), 2011, 2014, 2017
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# compiler.cxx_standard Standard for the C++ programming language
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Values: 1998 (Default), 2011, 2014, 2017
</span> #
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# compiler.require_fortran Is a Fortran compiler required?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Values: no (Default), yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# compiler.require_fortran Is a Fortran compiler required?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Values: no (Default), yes
</span> #
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# compiler.fortran_fallback If Fortran is required and is not provides by compiler,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# list of compilers to use
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Default value is the Fortran compilers in compiler.fallback
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# compiler.fortran_fallback If Fortran is required and is not provides by compiler,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# list of compilers to use
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Default value is the Fortran compilers in compiler.fallback
</span> #
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# compiler.openmp_version Version of OpenMP required (blank for none)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Values: blank (Default) 2.5, 3.0, 3.1, 4.0, 4.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# compiler.openmp_version Version of OpenMP required (blank for none)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Values: blank (Default) 2.5, 3.0, 3.1, 4.0, 4.5
</span> #
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# compiler.mpi MacPorts port that provides MPI
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Values: blank (Default), mpich, openmpi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# compiler.mpi MacPorts port that provides MPI
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Values: blank (Default), mpich, openmpi
</span> #
# compiler.thread_local_storage Is thread local storage required?
# Values: no (Default), yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,21 +60,21 @@
</span> # Ideally the functionality of this PortGroup should be integrated into
# MacPorts base as a new option.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-options \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.c_standard \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.cxx_standard \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.require_fortran \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.fortran_fallback \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.openmp_version \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.mpi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+options \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.c_standard \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.cxx_standard \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.require_fortran \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.fortran_fallback \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.openmp_version \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.mpi \
</span> compiler.thread_local_storage
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default compiler.c_standard 1989
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default compiler.cxx_standard 1998
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default compiler.require_fortran no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default compiler.fortran_fallback {[portconfigure::get_fortran_fallback]}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default compiler.openmp_version {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default compiler.mpi {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default compiler.c_standard 1989
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default compiler.cxx_standard 1998
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default compiler.require_fortran no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default compiler.fortran_fallback {[portconfigure::get_fortran_fallback]}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default compiler.openmp_version {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default compiler.mpi {}
</span> default compiler.thread_local_storage no
# replacement for portconfigure.tcl version
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -174,13 +174,13 @@ proc portconfigure::get_compiler_fallback {} {
</span> # if full_list is yes, then get all possible compilers that might work on this configuration
# if full_list is no, reducde the compiler list to the "best" compilers
proc portconfigure::get_valid_compilers {{full_list no} {just_fortran no}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xcodeversion \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.c_standard \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.cxx_standard \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.openmp_version \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- os.major \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cxx_stdlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xcodeversion \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.c_standard \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.cxx_standard \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.openmp_version \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os.major \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cxx_stdlib \
</span> compiler.thread_local_storage
# Check for platforms without Xcode
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -326,25 +326,25 @@ proc portconfigure::get_valid_compilers {{full_list no} {just_fortran no}} {
</span>
set clang_compilers ""
if {!${tls_an_issue}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # does Clang work on all i386 and x86_64 systems?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # according to https://packages.macports.org/clang-5.0/,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # clang builds back to Mac OS X 10.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend clang_compilers macports-clang-5.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${compiler.cxx_standard} < 2017 && [vercmp ${compiler.openmp_version} 4] < 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # allow latest Clang to be blacklisted by ports
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend clang_compilers macports-clang-4.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 17} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The High Sierra SDK requires a toolchain that can apply nullability to uuid_t
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend clang_compilers macports-clang-3.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 16} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The Sierra SDK requires a toolchain that supports class properties
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[expr [vercmp ${compiler.openmp_version} 0] <= 0]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend clang_compilers macports-clang-3.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # does Clang work on all i386 and x86_64 systems?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # according to https://packages.macports.org/clang-5.0/,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # clang builds back to Mac OS X 10.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend clang_compilers macports-clang-5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${compiler.cxx_standard} < 2017 && [vercmp ${compiler.openmp_version} 4] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # allow latest Clang to be blacklisted by ports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend clang_compilers macports-clang-4.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 17} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The High Sierra SDK requires a toolchain that can apply nullability to uuid_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend clang_compilers macports-clang-3.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 16} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The Sierra SDK requires a toolchain that supports class properties
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[expr [vercmp ${compiler.openmp_version} 0] <= 0]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend clang_compilers macports-clang-3.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span>
if {${just_fortran}} {
lappend compilers {*}${gcc_compilers}
</pre><pre style='margin:0'>
</pre>