<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/18127205a393ede0a4097cad9917a6ae8c35dcd8">https://github.com/macports/macports-ports/commit/18127205a393ede0a4097cad9917a6ae8c35dcd8</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 18127205a39 gcc-{10,11,12,devel}: Add new sub-port that provides sym-link to libc++ include dir to use
</span>18127205a39 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 18127205a393ede0a4097cad9917a6ae8c35dcd8
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Wed Nov 16 23:24:46 2022 +0000
<span style='display:block; white-space:pre;color:#404040;'> gcc-{10,11,12,devel}: Add new sub-port that provides sym-link to libc++ include dir to use
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Allows users flexibility in chossing the clang-X version they wish to use.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> In addition, is a step towards a future possible improvement where instead
</span><span style='display:block; white-space:pre;color:#404040;'> of using clang-X implementition, the new sub-port provides a gcc provided
</span><span style='display:block; white-space:pre;color:#404040;'> implementation that better supports libc++.
</span>---
lang/gcc-devel/Portfile | 91 ++++++++++++++++++++++++++++++++++++-------------
lang/gcc10/Portfile | 88 ++++++++++++++++++++++++++++++++++++-----------
lang/gcc11/Portfile | 86 +++++++++++++++++++++++++++++++++++-----------
lang/gcc12/Portfile | 87 ++++++++++++++++++++++++++++++++++------------
4 files changed, 266 insertions(+), 86 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc-devel/Portfile b/lang/gcc-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9d0c84c1652..38a919621fa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,6 +23,8 @@ long_description {*}${description}, including front ends for \
</span> This is an !experimental!, !BETA! version \
built from GCC snapshots.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set libgccname lib${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${os.arch} eq "arm"} {
# Use lead Darwin developer branch for now
# Eventually Darwin Arm support will be merged with upstream at which point
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,8 +35,8 @@ if {${os.arch} eq "arm"} {
</span>
# Version must follow same scheme as with GCC snapshots below <version>-<commit-date>
version 12-20220828
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- subport libgcc-devel { revision [ expr ${revision} + 0 ] }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subport ${libgccname} { revision [ expr ${revision} + 0 ] }
</span>
checksums rmd160 815adc894e0e0b7ec97ee6f764b6562aa6f6b9cf \
sha256 a5f0008e4ab94176dec83ef58634e0ff7d1b4754e803e0571a9ad1e2b33455ce \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,8 +46,8 @@ if {${os.arch} eq "arm"} {
</span> # Use regular GCC releases and snapshsots
version 13-20221106
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- subport libgcc-devel { revision [ expr ${revision} + 0 ] }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subport ${libgccname} { revision [ expr ${revision} + 0 ] }
</span>
checksums rmd160 42bfede2d9fb5819db7d46bf5d335a5bfaaacdc5 \
sha256 52167bafadf042b809283f22c1ad65999667fc61f4da830a01158b8dceae0201 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -207,28 +209,67 @@ pre-configure {
</span>
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant stdlib_flag description {Enable stdlib command line flag to select c++ runtime} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Enables support for specifying the c++ runtime via `-stdlib=` in a similar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # way to clang. For more details see the later comments in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://www.mail-archive.com/gcc-patches@gcc.gnu.org/msg257385.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Note : This 'bakes' the libc++ include directory into gcc,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # which is then used as the default search location when `-stdlib=libc++`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # is given. Therefore to have consistency across various OS versions, and to enable
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # modern c++ standards, use a recent macports clang port to provide this.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.platform} eq "darwin" && ${os.major} < 11 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set mp_clang_ver 11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set mp_clang_ver 15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set libcxxname ${name}-libcxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${libcxxname} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup compilers 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compilers.choose cxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compilers.setup -gcc -fortran
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ![clang_variant_isset] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Default default clang version to use
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.platform} eq "darwin" && ${os.major} < 11 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +clang11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +clang14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run-append port:clang-${mp_clang_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision [ expr ${revision} + 0 ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description Link to libc++ implementation to be used by ${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description {*}${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_extract
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ supported_archs noarch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Find clang/llvm version to use from active variant
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ proc getClangVersion {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [regexp {clang(.*)} [clang_variant_name] -> clang_v] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ${clang_v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mp_clang_ver [getClangVersion]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib port:clang-${mp_clang_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set incpath ${destroot}${prefix}/libexec/${name}/libc++/include/c++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mkdir ${incpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/libexec/llvm-${mp_clang_ver}/include/c++/v1 ${incpath}/v1
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-gxx-libcxx-include-dir="${prefix}/libexec/llvm-${mp_clang_ver}/include/c++/v1"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# libcxx is unavailable on PPC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${build_arch} ni [list ppc ppc64]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +stdlib_flag
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${subport} ne ${libcxxname} } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant stdlib_flag description {Enable stdlib command line flag to select c++ runtime} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Enables support for specifying the c++ runtime via `-stdlib=` in a similar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # way to clang. For more details see the later comments in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://www.mail-archive.com/gcc-patches@gcc.gnu.org/msg257385.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Note : This 'bakes' the libc++ include directory into gcc,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # which is then used as the default search location when `-stdlib=libc++`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # is given. Therefore to have consistency across various OS versions, and to enable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # modern c++ standards, use a recent macports clang port to provide this.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:${libcxxname}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-gxx-libcxx-include-dir="${prefix}/libexec/${name}/libc++/include/c++/v1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # libcxx is unavailable on PPC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${build_arch} ni [list ppc ppc64]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +stdlib_flag
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
# https://trac.macports.org/ticket/29067
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -273,7 +314,7 @@ set dylibs {libgcc_ext.10.4.dylib libgcc_ext.10.5.dylib libgcc_s.1.dylib libgcc_
</span> # Moving libgccjit.0.dylib to libgcc failed for some reason
# https://github.com/macports/macports-ports/commit/ce950c5729c9178cd6c61f9f4096888a026bb87f#commitcomment-78932371
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} ne ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${libgccname}} {
</span>
# Set conflict against port providing primary runtime
if { ${os.major} < 10 } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -384,7 +425,9 @@ if {${subport} ne ${name}} {
</span>
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${name}} {
</span>
post-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc10/Portfile b/lang/gcc10/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2251a19b893..ff97c688644 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc10/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc10/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,9 +7,11 @@ PortGroup active_variants 1.1
</span> PortGroup conflicts_build 1.0
epoch 7
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> name gcc10
version 10.4.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> platforms darwin
categories lang
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +43,8 @@ checksums rmd160 5095b725b8846a4946495f5415aab02c3352d763 \
</span> sha256 c9297d5bcd7cb43f3dfc2fed5389e948c9312fd962ef6a4ce455cff963ebe4f1 \
size 75018092
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport libgcc10 { revision [ expr ${revision} + 0 ] }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set libgccname lib${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${libgccname} { revision [ expr ${revision} + 0 ] }
</span>
if { ${os.platform} eq "darwin" } {
# Patch generated from https://github.com/iains/gcc-10-branch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -187,25 +190,68 @@ pre-configure {
</span>
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant stdlib_flag description {Enable stdlib command line flag to select c++ runtime} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Enables support for specifying the c++ runtime via `-stdlib=` in a similar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # way to clang. For more details see the later comments in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://www.mail-archive.com/gcc-patches@gcc.gnu.org/msg257385.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Note : This 'bakes' the libc++ include directory into gcc,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # which is then used as the default search location when `-stdlib=libc++`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # is given. Therefore to have consistency across various OS versions, and to enable
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # modern c++ standards, use a recent macports clang port to provide this.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.platform} eq "darwin" && ${os.major} < 11 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set mp_clang_ver 11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set mp_clang_ver 14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set libcxxname ${name}-libcxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${libcxxname} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup compilers 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compilers.choose cxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compilers.setup -gcc -fortran
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ![clang_variant_isset] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Default default clang version to use
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.platform} eq "darwin" && ${os.major} < 11 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +clang11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +clang14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision [ expr ${revision} + 0 ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description Link to libc++ implementation to be used by ${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description {*}${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_extract
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ supported_archs noarch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Find clang/llvm version to use from active variant
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ proc getClangVersion {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [regexp {clang(.*)} [clang_variant_name] -> clang_v] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ${clang_v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mp_clang_ver [getClangVersion]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib port:clang-${mp_clang_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set incpath ${destroot}${prefix}/libexec/${name}/libc++/include/c++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mkdir ${incpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/libexec/llvm-${mp_clang_ver}/include/c++/v1 ${incpath}/v1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${subport} ne ${libcxxname} } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant stdlib_flag description {Enable stdlib command line flag to select c++ runtime} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Enables support for specifying the c++ runtime via `-stdlib=` in a similar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # way to clang. For more details see the later comments in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://www.mail-archive.com/gcc-patches@gcc.gnu.org/msg257385.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Note : This 'bakes' the libc++ include directory into gcc,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # which is then used as the default search location when `-stdlib=libc++`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # is given. Therefore to have consistency across various OS versions, and to enable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # modern c++ standards, use a recent macports clang port to provide this.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:${libcxxname}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-gxx-libcxx-include-dir="${prefix}/libexec/${name}/libc++/include/c++/v1"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run-append port:clang-${mp_clang_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # libcxx is unavailable on PPC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${build_arch} ni [list ppc ppc64]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +stdlib_flag
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-gxx-libcxx-include-dir="${prefix}/libexec/llvm-${mp_clang_ver}/include/c++/v1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants-append +stdlib_flag
</span>
# https://trac.macports.org/ticket/29067
# https://trac.macports.org/ticket/29104
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -258,7 +304,7 @@ if { ${os.arch} eq "arm" } {
</span> set install_dylibs {libgcc_ext.10.4.dylib libgcc_ext.10.5.dylib}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} ne ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${libgccname}} {
</span>
# Activate hack for new libgcc
# https://trac.macports.org/wiki/PortfileRecipes#deactivatehack
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -366,7 +412,9 @@ if {${subport} ne ${name}} {
</span> system "echo ${subport} provides additional runtime > ${doc_dir}/README"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${name}} {
</span>
post-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc11/Portfile b/lang/gcc11/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6bdc17ffdef..55fc74f036c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc11/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc11/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@ epoch 2
</span> name gcc11
version 11.3.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span>
platforms darwin
categories lang
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,7 +45,8 @@ checksums rmd160 0c54f3971b4afbd78954d46852f733ff3fae266c \
</span> sha256 b47cf2818691f5b1e21df2bb38c795fac2cfbd640ede2d0a5e1c89e338a3ac39 \
size 81141364
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport libgcc11 { revision [ expr ${revision} + 0 ] }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set libgccname lib${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${libgccname} { revision [ expr ${revision} + 0 ] }
</span>
if { ${os.platform} eq "darwin" } {
# Patch generated from https://github.com/iains/gcc-11-branch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -211,25 +212,68 @@ pre-configure {
</span>
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant stdlib_flag description {Enable stdlib command line flag to select c++ runtime} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Enables support for specifying the c++ runtime via `-stdlib=` in a similar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # way to clang. For more details see the later comments in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://www.mail-archive.com/gcc-patches@gcc.gnu.org/msg257385.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Note : This 'bakes' the libc++ include directory into gcc,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # which is then used as the default search location when `-stdlib=libc++`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # is given. Therefore to have consistency across various OS versions, and to enable
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # modern c++ standards, use a recent macports clang port to provide this.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.platform} eq "darwin" && ${os.major} < 11 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set mp_clang_ver 11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set mp_clang_ver 14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set libcxxname ${name}-libcxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${libcxxname} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup compilers 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compilers.choose cxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compilers.setup -gcc -fortran
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ![clang_variant_isset] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Default default clang version to use
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.platform} eq "darwin" && ${os.major} < 11 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +clang11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +clang14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision [ expr ${revision} + 0 ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description Link to libc++ implementation to be used by ${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description {*}${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_extract
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ supported_archs noarch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Find clang/llvm version to use from active variant
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ proc getClangVersion {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [regexp {clang(.*)} [clang_variant_name] -> clang_v] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ${clang_v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ""
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run-append port:clang-${mp_clang_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mp_clang_ver [getClangVersion]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib port:clang-${mp_clang_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set incpath ${destroot}${prefix}/libexec/${name}/libc++/include/c++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mkdir ${incpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/libexec/llvm-${mp_clang_ver}/include/c++/v1 ${incpath}/v1
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-gxx-libcxx-include-dir="${prefix}/libexec/llvm-${mp_clang_ver}/include/c++/v1"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants-append +stdlib_flag
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${subport} ne ${libcxxname} } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant stdlib_flag description {Enable stdlib command line flag to select c++ runtime} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Enables support for specifying the c++ runtime via `-stdlib=` in a similar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # way to clang. For more details see the later comments in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://www.mail-archive.com/gcc-patches@gcc.gnu.org/msg257385.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Note : This 'bakes' the libc++ include directory into gcc,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # which is then used as the default search location when `-stdlib=libc++`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # is given. Therefore to have consistency across various OS versions, and to enable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # modern c++ standards, use a recent macports clang port to provide this.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:${libcxxname}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-gxx-libcxx-include-dir="${prefix}/libexec/${name}/libc++/include/c++/v1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # libcxx is unavailable on PPC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${build_arch} ni [list ppc ppc64]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +stdlib_flag
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
# https://trac.macports.org/ticket/29067
# https://trac.macports.org/ticket/29104
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -272,7 +316,7 @@ set all_dylibs {libgcc_ext.10.4.dylib libgcc_ext.10.5.dylib libgcc_s.1.dylib lib
</span> libubsan.1.dylib libatomic.1.dylib libgcc_ehs.1.1.dylib}
set install_dylibs {libasan.6.dylib}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${subport} ne ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${libgccname}} {
</span>
# Activate hack for new libgcc
# https://trac.macports.org/wiki/PortfileRecipes#deactivatehack
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -389,7 +433,9 @@ if { ${subport} ne ${name}} {
</span>
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${name}} {
</span>
post-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc12/Portfile b/lang/gcc12/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ac18e8cb0d9..13e07b05ca0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc12/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc12/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,8 +21,10 @@ long_description {*}${description}, including front ends for \
</span> C, C++, Objective-C, Objective-C++ and Fortran.
version 12.2.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-subport libgcc12 { revision [ expr ${revision} + 0 ] }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set libgccname lib${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${libgccname} { revision [ expr ${revision} + 0 ] }
</span>
checksums rmd160 76d30c411227d6c3e87dd4f0a8ea1ae5d8ab9ffd \
sha256 e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -179,28 +181,67 @@ pre-configure {
</span>
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant stdlib_flag description {Enable stdlib command line flag to select c++ runtime} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Enables support for specifying the c++ runtime via `-stdlib=` in a similar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # way to clang. For more details see the later comments in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://www.mail-archive.com/gcc-patches@gcc.gnu.org/msg257385.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Note : This 'bakes' the libc++ include directory into gcc,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # which is then used as the default search location when `-stdlib=libc++`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # is given. Therefore to have consistency across various OS versions, and to enable
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # modern c++ standards, use a recent macports clang port to provide this.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.platform} eq "darwin" && ${os.major} < 11 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set mp_clang_ver 11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set mp_clang_ver 15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set libcxxname ${name}-libcxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${libcxxname} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup compilers 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compilers.choose cxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compilers.setup -gcc -fortran
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ![clang_variant_isset] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Default default clang version to use
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.platform} eq "darwin" && ${os.major} < 11 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +clang11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +clang14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run-append port:clang-${mp_clang_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision [ expr ${revision} + 0 ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description Link to libc++ implementation to be used by ${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description {*}${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_extract
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ supported_archs noarch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Find clang/llvm version to use from active variant
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ proc getClangVersion {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [regexp {clang(.*)} [clang_variant_name] -> clang_v] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ${clang_v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mp_clang_ver [getClangVersion]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib port:clang-${mp_clang_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set incpath ${destroot}${prefix}/libexec/${name}/libc++/include/c++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mkdir ${incpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/libexec/llvm-${mp_clang_ver}/include/c++/v1 ${incpath}/v1
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-gxx-libcxx-include-dir="${prefix}/libexec/llvm-${mp_clang_ver}/include/c++/v1"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# libcxx is unavailable on PPC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${build_arch} ni [list ppc ppc64]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +stdlib_flag
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${subport} ne ${libcxxname} } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant stdlib_flag description {Enable stdlib command line flag to select c++ runtime} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Enables support for specifying the c++ runtime via `-stdlib=` in a similar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # way to clang. For more details see the later comments in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://www.mail-archive.com/gcc-patches@gcc.gnu.org/msg257385.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Note : This 'bakes' the libc++ include directory into gcc,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # which is then used as the default search location when `-stdlib=libc++`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # is given. Therefore to have consistency across various OS versions, and to enable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # modern c++ standards, use a recent macports clang port to provide this.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:${libcxxname}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-gxx-libcxx-include-dir="${prefix}/libexec/${name}/libc++/include/c++/v1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # libcxx is unavailable on PPC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${build_arch} ni [list ppc ppc64]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +stdlib_flag
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
# https://trac.macports.org/ticket/29067
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -242,7 +283,7 @@ set dylibs {libgcc_ext.10.4.dylib libgcc_ext.10.5.dylib libgcc_s.1.dylib libgcc_
</span> libobjc-gnu.4.dylib libgomp.1.dylib libitm.1.dylib libssp.0.dylib libasan.8.dylib \
libubsan.1.dylib libatomic.1.dylib libgcc_ehs.1.1.dylib}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} ne ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${libgccname}} {
</span>
# Always provides primary runtime so always in conflict
conflicts libgcc-devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -372,7 +413,9 @@ if {${subport} ne ${name}} {
</span>
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${name}} {
</span>
post-destroot {
</pre><pre style='margin:0'>
</pre>