<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b98ee6c065381f727be4901077433a8edd46aa1f">https://github.com/macports/macports-ports/commit/b98ee6c065381f727be4901077433a8edd46aa1f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b98ee6c065381f727be4901077433a8edd46aa1f
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Sat Jun 24 05:32:37 2023 +0800

<span style='display:block; white-space:pre;color:#404040;'>    ghc-bootstrap, ghc-ppc-bootstrap: drop extra variants, retain gcc42 and gcc7
</span>---
 lang/ghc-bootstrap/Portfile     | 43 +++++------------------------------------
 lang/ghc-ppc-bootstrap/Portfile | 25 ++++--------------------
 2 files changed, 9 insertions(+), 59 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ghc-bootstrap/Portfile b/lang/ghc-bootstrap/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 05eaf39cb78..186afe9ec5f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ghc-bootstrap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ghc-bootstrap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ set canonicalname   ghc
</span> version             7.6.3
 revision            0
 categories          lang haskell
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers         {cal @neverpanic} {@barracuda156 gmail.com:vital.had} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers         {@barracuda156 gmail.com:vital.had} openmaintainer
</span> license             BSD
 # ppc64 will need cross-compilation, not enabled for now.
 supported_archs     i386 x86_64 ppc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -102,57 +102,24 @@ platform darwin {
</span>         # This is PPC:
         compiler.blacklist-append   *clang*
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        # gcc11 and gcc12 do not build it. Restriction to gcc7 is on purpose.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        # BEGIN gcc variants
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # Newer gcc do not build it. Restriction to gcc7 is on purpose.
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        variant gcc7 conflicts gcc6 gcc49 gcc48 gcc42 description {Compile with gcc 7} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        variant gcc7 conflicts gcc42 description {Compile with gcc 7} {
</span>             configure.compiler      macports-gcc-7
             depends_run-append      port:gcc7
             require_active_variants ghc-ppc-bootstrap gcc7
             configure.args-append   --with-gcc=${configure.cc}
         }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        variant gcc6 conflicts gcc7 gcc49 gcc48 gcc42 description {Compile with gcc 6} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            configure.compiler      macports-gcc-6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            depends_run-append      port:gcc6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            require_active_variants ghc-ppc-bootstrap gcc6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            configure.args-append   --with-gcc=${configure.cc}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        variant gcc49 conflicts gcc7 gcc6 gcc48 gcc42 description {Compile with gcc 4.9} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            configure.compiler      macports-gcc-4.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            depends_run-append      port:gcc49
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            require_active_variants ghc-ppc-bootstrap gcc49
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            configure.args-append   --with-gcc=${configure.cc}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            # compiler doesn't accept -arch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            configure.cc_archflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            configure.cxx_archflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            configure.objc_archflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            configure.ld_archflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        variant gcc48 conflicts gcc7 gcc6 gcc49 gcc42 description {Compile with gcc 4.8} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            configure.compiler      macports-gcc-4.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            depends_run-append      port:gcc48
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            require_active_variants ghc-ppc-bootstrap gcc48
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            configure.args-append   --with-gcc=${configure.cc}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            # compiler doesn't accept -arch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            configure.cc_archflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            configure.cxx_archflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            configure.objc_archflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            configure.ld_archflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        variant gcc42 conflicts gcc7 gcc6 gcc49 gcc48 description {Compile with Xcode gcc 4.2} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        variant gcc42 conflicts gcc7 description {Compile with Xcode gcc 4.2} {
</span>             configure.compiler      gcc-4.2
             require_active_variants ghc-ppc-bootstrap gcc42
             configure.args-append   --with-gcc=${configure.cc}
         }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        if {![variant_isset gcc7] && ![variant_isset gcc6] && ![variant_isset gcc49]  && ![variant_isset gcc48] && ![variant_isset gcc42]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {![variant_isset gcc7] && ![variant_isset gcc42]} {
</span>             default_variants +gcc42
         }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        # END gcc variants
</span>     }
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ghc-ppc-bootstrap/Portfile b/lang/ghc-ppc-bootstrap/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 96bb63536c7..9a46ba3c1a2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ghc-ppc-bootstrap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ghc-ppc-bootstrap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,36 +29,19 @@ depends_extract     port:xar
</span> 
 worksrcdir          ${canonicalname}-${version}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# BEGIN gcc variants
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Newer gcc does not build ghc-bootstrap, so no point making variants here as well.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant gcc7 conflicts gcc6 gcc49 gcc48 gcc42 description {Compile with gcc 7} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Newer gcc does not build ghc-bootstrap, so no point making variants here for those.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant gcc7 conflicts gcc42 description {Compile with gcc 7} {
</span>     configure.compiler      macports-gcc-7
     depends_run-append      port:gcc7
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant gcc6 conflicts gcc7 gcc49 gcc48 gcc42 description {Compile with gcc 6} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.compiler      macports-gcc-6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_run-append      port:gcc6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant gcc49 conflicts gcc7 gcc6 gcc48 gcc42 description {Compile with gcc 4.9} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.compiler      macports-gcc-4.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_run-append      port:gcc49
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant gcc48 conflicts gcc7 gcc6 gcc49 gcc42 description {Compile with gcc 4.8} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.compiler      macports-gcc-4.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_run-append      port:gcc48
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant gcc42 conflicts gcc7 gcc6 gcc49 gcc48 description {Compile with Xcode gcc 4.2} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant gcc42 conflicts gcc7 description {Compile with Xcode gcc 4.2} {
</span>     configure.compiler      gcc-4.2
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset gcc7] && ![variant_isset gcc6] && ![variant_isset gcc49] && ![variant_isset gcc48] & ![variant_isset gcc42]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset gcc7] && ![variant_isset gcc42]} {
</span>     default_variants +gcc42
 }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# END gcc variants
</span> 
 extract {
     system -W ${workpath} "mkdir -p ${worksrcpath}/pkg"
</pre><pre style='margin:0'>

</pre>