<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/727a85cf0fc01f1db61b490d63dbf78f872e326d">https://github.com/macports/macports-ports/commit/727a85cf0fc01f1db61b490d63dbf78f872e326d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 727a85cf0fc01f1db61b490d63dbf78f872e326d
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Apr 21 09:18:49 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> languages PG: add more comments
</span>---
_resources/port1.0/group/languages-1.0.tcl | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
<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 ded80ea..4c9e446 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;'>@@ -73,6 +73,7 @@ default compiler.openmp_version {}
</span> default compiler.mpi {}
# replacement for portconfigure.tcl version
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# change: add new compilers (G95, MPI, OpenMP)
</span> proc portconfigure::configure_start {args} {
global UI_PREFIX
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -151,6 +152,7 @@ proc portconfigure::configure_start {args} {
</span> }
# replacement for portconfigure.tcl version
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# change: replace almost all code with helper procedure get_valid_compilers
</span> proc portconfigure::get_compiler_fallback {} {
global \
default_compilers \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -382,6 +384,7 @@ proc portconfigure::get_valid_compilers {{full_list no} {just_fortran no}} {
</span> }
# replacement for portconfigure.tcl version
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# change: add new compilers (G95, MPI, OpenMP)
</span> proc portconfigure::compiler_port_name {compiler} {
set valid_compiler_ports {
{^apple-gcc-(\d+)\.(\d+)$} {apple-gcc%s%s}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -419,6 +422,7 @@ proc portconfigure::get_fortran_fallback {} {
</span> }
# replacement for portconfigure.tcl version
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# change: replace almost all code with helper procedure configure_get_first_compiler
</span> proc portconfigure::configure_get_default_compiler {} {
if {[option compiler.whitelist] ne ""} {
set search_list [option compiler.whitelist]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -466,7 +470,8 @@ proc portconfigure::configure_get_first_compiler {compilerName search_list} {
</span> return [lindex [option compiler.fallback] 0]
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# replacemenet for portconfigure.tcl version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# replacemenet for portconfigure.tcl procedure configure_get_compiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# change: add new compilers (G95, MPI, OpenMP)
</span> proc portconfigure::configure_get_compiler_real {type compiler} {
global prefix
# Tcl 8.4's switch doesn't support -matchvar.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -613,6 +618,8 @@ proc portconfigure::configure_get_compiler_real {type compiler} {
</span> }
# extension of portconfigure.tcl version
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# change: replace almost all code with helper procedure configure_get_compiler_real
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# change: if configure_get_compiler_real fails to find a compiler, handle Fortran case differently
</span> proc portconfigure::configure_get_compiler {type {compiler {}}} {
global configure.compiler
if {$compiler eq ""} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -637,6 +644,8 @@ proc portconfigure::configure_get_compiler {type {compiler {}}} {
</span> }
# replacement for portconfigure.tcl version
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# change: replace almost all code with helper procedure add_compiler_port_dependencies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# change: Fortran compiler dependency is a special case (e.g. clang++ from Xcode and gfortran from MacPorts GCC)
</span> proc portconfigure::add_automatic_compiler_dependencies {} {
global configure.compiler configure.compiler.add_deps
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -653,6 +662,7 @@ proc portconfigure::add_automatic_compiler_dependencies {} {
</span> }
if {[option compiler.require_fortran] && [portconfigure::configure_get_compiler_real fc ${compiler}] eq ""} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fortran is required, but compiler does not provide it
</span> ui_debug "Adding Fortran compiler dependency"
set fortran_compiler [portconfigure::configure_get_first_fortran_compiler]
portconfigure::add_compiler_port_dependencies ${fortran_compiler}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -735,6 +745,7 @@ proc portconfigure::add_compiler_port_dependencies {compiler} {
</span> }
# replacement for portconfigure.tcl version
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# change: use macports-libstdc++ for libstdc++ if C++11 is required
</span> default configure.cxx_stdlib {[portconfigure::configure_cxx_stdlib]}
# helper function to set configure.cxx_stdlib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -759,6 +770,7 @@ proc portconfigure::configure_cxx_stdlib {} {
</span> }
# replacement for portconfigure.tcl version
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# change: use compiler.cxx_standard
</span> proc portconfigure::should_add_cxx_abi {} {
global os.major cxx_stdlib
# prior to OS X Mavericks, libstdc++ was the default C++ runtime, so
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -770,6 +782,7 @@ proc portconfigure::should_add_cxx_abi {} {
</span> }
# replacement for portconfigure.tcl version
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# change: ensure -D_GLIBCXX_USE_CXX11_ABI=0 is added if needed
</span> proc portconfigure::stdlib_trace {opt action args} {
foreach flag [lsearch -all -inline [option $opt] -stdlib=*] {
$opt-delete $flag
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -786,6 +799,7 @@ proc portconfigure::stdlib_trace {opt action args} {
</span> }
# replacement for portconfigure.tcl version
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# change: add more compilers that support -arch
</span> proc portconfigure::arch_flag_supported {compiler} {
# GCC prior to 4.7 does not accept -arch flag
if {[regexp {^macports(?:-[^-]+)?-gcc-4\.[0-6]} $compiler]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -796,6 +810,7 @@ proc portconfigure::arch_flag_supported {compiler} {
</span> }
# replacement for portutil.tcl version
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# change: test to see if compiler supports universal builds
</span> proc universal_setup {args} {
if {[variant_exists universal]} {
ui_debug "universal variant already exists, so not adding the default one"
</pre><pre style='margin:0'>
</pre>