<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/e41f71e9a65b81fcdaa8128ce76b0bbf6a722c3c">https://github.com/macports/macports-base/commit/e41f71e9a65b81fcdaa8128ce76b0bbf6a722c3c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e41f71e9a65b81fcdaa8128ce76b0bbf6a722c3c
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Sep 27 16:31:01 2022 +1000
<span style='display:block; white-space:pre;color:#404040;'> portconfigure: use list constructor
</span>---
src/port1.0/portconfigure.tcl | 48 +++++++++++++++++++++----------------------
1 file changed, 24 insertions(+), 24 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portconfigure.tcl b/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 30ea0d484..fedf9adc3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1101,37 +1101,37 @@ proc portconfigure::get_apple_compilers_xcode_version {} {
</span> # attempt to include all available compilers except gcc-3*
# attempt to have the default compilers first
if {[vercmp ${xcodeversion} 5] >= 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set compilers {clang}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set compilers [list clang]
</span> } elseif {[vercmp ${xcodeversion} 4.3] >= 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set compilers {clang llvm-gcc-4.2}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set compilers [list clang llvm-gcc-4.2]
</span> } elseif {[vercmp ${xcodeversion} 4.2] >= 0} {
# llvm-gcc is more reliable
# see https://github.com/macports/macports-base/commit/10d62cb51b1f0f9703a873173bac468eee69d01a
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set compilers {llvm-gcc-4.2 clang}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set compilers [list llvm-gcc-4.2 clang]
</span> } elseif {[vercmp ${xcodeversion} 4.0] >= 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set compilers {llvm-gcc-4.2 clang gcc-4.2}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set compilers [list llvm-gcc-4.2 clang gcc-4.2]
</span> } else {
# Legacy Cases
if {[string match *10.4u* [option configure.sdkroot]]} {
# from Xcode 3.2 release notes:
# GCC 4.2 cannot be used with the Mac OS X 10.4u SDK.
# If you want to build targets using the 10.4u SDK on Xcode 3.2, you must set the Compiler Version to GCC 4.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set compilers {gcc-4.0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set compilers [list gcc-4.0]
</span> } else {
if {[vercmp ${xcodeversion} 3.2] >= 0} {
# from about_xcode_3.2.pdf:
# GCC 4.2 is the primary system compiler for the 10.6 SDK
# clang does *not* provide clang++, but configure.cxx will fall back to llvm-g++-4.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set compilers {gcc-4.2 llvm-gcc-4.2 clang gcc-4.0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set compilers [list gcc-4.2 llvm-gcc-4.2 clang gcc-4.0]
</span> } elseif {[vercmp ${xcodeversion} 3.1] >= 0} {
# from about_xcode_tools_3.1.pdf:
# GCC 4.2 & LLVM GCC 4.2 optional compilers
# assume they exist
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set compilers {gcc-4.2 llvm-gcc-4.2 apple-gcc-4.2 gcc-4.0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set compilers [list gcc-4.2 llvm-gcc-4.2 apple-gcc-4.2 gcc-4.0]
</span> } elseif {[vercmp ${xcodeversion} 3.0] >= 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set compilers {apple-gcc-4.2 gcc-4.0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set compilers [list apple-gcc-4.2 gcc-4.0]
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set compilers {apple-gcc-4.2 gcc-4.0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set compilers [list apple-gcc-4.2 gcc-4.0]
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1142,18 +1142,18 @@ proc portconfigure::get_apple_compilers_os_version {} {
</span> global os.major
if {${os.major} >= 13} {
# 5.0.1 <= Xcode
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set test_compilers {clang}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set test_compilers [list clang]
</span> } elseif {${os.major} >= 12} {
# 4.4 <= Xcode <= 5.1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set test_compilers {clang llvm-gcc-4.2}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set test_compilers [list clang llvm-gcc-4.2]
</span> } elseif {${os.major} >= 11} {
# 4.1 <= Xcode <= 4.6.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set test_compilers {clang llvm-gcc-4.2 gcc-4.2}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set test_compilers [list clang llvm-gcc-4.2 gcc-4.2]
</span> } else {
# Command Line Tools is only available for Mac OS X 10.7 Lion and above
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set test_compilers ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set test_compilers [list]
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set compilers ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set compilers [list]
</span> foreach cc ${test_compilers} {
if {[file executable [find_developer_tool $cc]]} {
lappend compilers $cc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1164,7 +1164,7 @@ proc portconfigure::get_apple_compilers_os_version {} {
</span> # utility procedure: get Clang compilers based on os.major
proc portconfigure::get_clang_compilers {} {
global os.major porturl
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set compilers ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set compilers [list]
</span> set compiler_file [getportresourcepath $porturl "port1.0/compilers/clang_compilers.tcl"]
if {[file exists ${compiler_file}]} {
source ${compiler_file}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1212,7 +1212,7 @@ proc portconfigure::get_clang_compilers {} {
</span> # utility procedure: get GCC compilers based on os.major
proc portconfigure::get_gcc_compilers {} {
global os.major os.arch porturl
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set compilers ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set compilers [list]
</span> set compiler_file [getportresourcepath $porturl "port1.0/compilers/gcc_compilers.tcl"]
if {[file exists ${compiler_file}]} {
source ${compiler_file}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1278,7 +1278,7 @@ proc portconfigure::get_compiler_fallback {} {
</span> } else {
set available_apple_compilers [portconfigure::get_apple_compilers_xcode_version]
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set system_compilers ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set system_compilers [list]
</span> foreach c ${available_apple_compilers} {
set vmin [portconfigure::get_min_command_line $c]
if {$vmin ne "none"} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1293,7 +1293,7 @@ proc portconfigure::get_compiler_fallback {} {
</span> }
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set clang_compilers ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set clang_compilers [list]
</span> set vmin [portconfigure::get_min_clang]
foreach c [portconfigure::get_clang_compilers] {
set v [lindex [split $c -] 2]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1301,7 +1301,7 @@ proc portconfigure::get_compiler_fallback {} {
</span> lappend clang_compilers $c
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set gcc_compilers ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set gcc_compilers [list]
</span> set vmin [portconfigure::get_min_gcc]
if {$vmin ne "none"} {
foreach c [portconfigure::get_gcc_compilers] {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1311,7 +1311,7 @@ proc portconfigure::get_compiler_fallback {} {
</span> }
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set compilers ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set compilers [list]
</span> lappend compilers {*}${system_compilers}
# when building for PowerPC architectures, prefer GCC to Clang
if {[option configure.build_arch] eq "ppc" || [option configure.build_arch] eq "ppc64"} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1325,7 +1325,7 @@ proc portconfigure::get_compiler_fallback {} {
</span> if {[option compiler.mpi] eq ""} {
return $compilers
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set mpi_compilers ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mpi_compilers [list]
</span> foreach mpi [option compiler.mpi] {
foreach c ${compilers} {
lappend mpi_compilers [portconfigure::get_mpi_wrapper $mpi $c]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1336,7 +1336,7 @@ proc portconfigure::get_compiler_fallback {} {
</span> }
#
proc portconfigure::get_fortran_fallback {} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set compilers ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set compilers [list]
</span> set vmin [portconfigure::get_min_gfortran]
foreach c [portconfigure::get_gcc_compilers] {
set v [lindex [split $c -] 2]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1351,7 +1351,7 @@ proc portconfigure::get_fortran_fallback {} {
</span> if {[option compiler.mpi] eq ""} {
return $compilers
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set mpi_compilers ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mpi_compilers [list]
</span> foreach mpi [option compiler.mpi] {
foreach c ${compilers} {
lappend mpi_compilers [portconfigure::get_mpi_wrapper $mpi $c]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1869,7 +1869,7 @@ proc portconfigure::check_implicit_function_declarations {} {
</span> }
proc portconfigure::load_implicit_function_declaration_whitelist {sdk_version} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set whitelist {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set whitelist [list]
</span>
set whitelist_file [getdefaultportresourcepath "port1.0/checks/implicit_function_declaration/macosx${sdk_version}.sdk.list"]
if {[file exists $whitelist_file]} {
</pre><pre style='margin:0'>
</pre>