<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/fbebd2fd681808ea7ff45adf8020596fc2d4a42d">https://github.com/macports/macports-base/commit/fbebd2fd681808ea7ff45adf8020596fc2d4a42d</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new fbebd2fd In port lint recognize more invalid platform archs
</span>fbebd2fd is described below
<span style='display:block; white-space:pre;color:#808000;'>commit fbebd2fd681808ea7ff45adf8020596fc2d4a42d
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Jul 17 13:45:09 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> In port lint recognize more invalid platform archs
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> In addition to recognizing the invalid platform arch "ppc", recognize
</span><span style='display:block; white-space:pre;color:#404040;'> other likely invalid values like "arm64", "intel", "ppc64", and "x86_64"
</span><span style='display:block; white-space:pre;color:#404040;'> and guide developers to the proper values.
</span>---
src/port1.0/portlint.tcl | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portlint.tcl b/src/port1.0/portlint.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 0e81addb..312a4855 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portlint.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portlint.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -399,9 +399,17 @@ proc portlint::lint_main {args} {
</span>
if {[regexp {^\s*platform\s} $line]} {
regexp {^\s*platform\s+(?:\w+\s+(?:\w+\s+)?)?(\w+)} $line -> platform_arch
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$platform_arch eq "ppc"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "Arch 'ppc' in platform on line $lineno should be 'powerpc'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- incr errors
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach {bad_platform_arch replacement_platform_arch} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ arm64 arm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ intel i386
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ppc powerpc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ppc64 powerpc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x86_64 i386
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$platform_arch eq $bad_platform_arch} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "Arch '$bad_platform_arch' in platform on line $lineno should be '$replacement_platform_arch'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ incr errors
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
</pre><pre style='margin:0'>
</pre>