<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/ce460a5e22982f7cca961b9d7021915726d948af">https://github.com/macports/macports-ports/commit/ce460a5e22982f7cca961b9d7021915726d948af</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 ce460a5e229 misc. ports: Update path-like dependencies on libgcc to use a readme file, instead of a versioned library that might well disappear in a future gcc release. Using the readme files means MacPorts can be certain it will remain part of the libgcc(-devel) content.
</span>ce460a5e229 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ce460a5e22982f7cca961b9d7021915726d948af
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Thu Nov 26 21:00:16 2020 +0000
<span style='display:block; white-space:pre;color:#404040;'> misc. ports: Update path-like dependencies on libgcc to use a readme file,
</span><span style='display:block; white-space:pre;color:#404040;'> instead of a versioned library that might well disappear in a
</span><span style='display:block; white-space:pre;color:#404040;'> future gcc release. Using the readme files means MacPorts can
</span><span style='display:block; white-space:pre;color:#404040;'> be certain it will remain part of the libgcc(-devel) content.
</span>---
_resources/port1.0/compilers/gcc_dependencies.tcl | 6 +++---
_resources/port1.0/group/compilers-1.0.tcl | 6 +++---
_resources/port1.0/group/cxx11-1.1.tcl | 6 +++---
java/launch4j/Portfile | 2 +-
lang/g95/Portfile | 2 +-
lang/gcc10/Portfile | 2 +-
lang/gcc7/Portfile | 2 +-
lang/gcc8/Portfile | 2 +-
lang/gcc9/Portfile | 2 +-
lang/upc/Portfile | 2 +-
science/root5/Portfile | 2 +-
science/root6/Portfile | 2 +-
12 files changed, 18 insertions(+), 18 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/compilers/gcc_dependencies.tcl b/_resources/port1.0/compilers/gcc_dependencies.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 9c7780acd38..abe4a7a5961 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/compilers/gcc_dependencies.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/compilers/gcc_dependencies.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,9 +2,9 @@
</span>
# compiler links against libraries in libgcc\d* and/or libgcc-devel
if {[vercmp ${gcc_version} 4.6] < 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set libgccs "path:lib/libgcc/libgcc_s.1.dylib:libgcc port:libgcc45"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libgccs "path:share/doc/libgcc/README:libgcc port:libgcc45"
</span> } elseif {[vercmp ${gcc_version} 7] < 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set libgccs "path:lib/libgcc/libgcc_s.1.dylib:libgcc port:libgcc6"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libgccs "path:share/doc/libgcc/README:libgcc port:libgcc6"
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set libgccs "path:lib/libgcc/libgcc_s.1.dylib:libgcc port:libgcc${gcc_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libgccs "path:share/doc/libgcc/README:libgcc port:libgcc${gcc_version}"
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/compilers-1.0.tcl b/_resources/port1.0/group/compilers-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 7129f291495..426ea5b2c04 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/compilers-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/compilers-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,11 +98,11 @@ foreach ver ${gcc_versions} {
</span> set cdb(gcc$ver_nodot,descrip) "MacPorts gcc $ver"
set cdb(gcc$ver_nodot,depends) port:gcc$ver_nodot
if {[vercmp ${ver} 4.6] < 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set cdb(gcc$ver_nodot,dependsl) "path:lib/libgcc/libgcc_s.1.dylib:libgcc port:libgcc45"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cdb(gcc$ver_nodot,dependsl) "path:share/doc/libgcc/README:libgcc port:libgcc45"
</span> } elseif {[vercmp ${ver} 7] < 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set cdb(gcc$ver_nodot,dependsl) "path:lib/libgcc/libgcc_s.1.dylib:libgcc port:libgcc6"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cdb(gcc$ver_nodot,dependsl) "path:share/doc/libgcc/README:libgcc port:libgcc6"
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set cdb(gcc$ver_nodot,dependsl) "path:lib/libgcc/libgcc_s.1.dylib:libgcc port:libgcc${ver_nodot}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cdb(gcc$ver_nodot,dependsl) "path:share/doc/libgcc/README:libgcc port:libgcc${ver_nodot}"
</span> }
set cdb(gcc$ver_nodot,libfortran) ${prefix}/lib/gcc$ver_nodot/libgfortran.dylib
# note: above is ultimately a symlink to ${prefix}/lib/libgcc/libgfortran.3.dylib
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/cxx11-1.1.tcl b/_resources/port1.0/group/cxx11-1.1.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 3fe816eb822..895c9dd4a1e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/cxx11-1.1.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/cxx11-1.1.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,8 +29,8 @@ if {${configure.cxx_stdlib} eq "libstdc++"} {
</span>
proc cxx11.add_dependencies {} {
global os.major os.platform
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete path:lib/libgcc/libgcc_s.1.dylib:libgcc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete path:share/doc/libgcc/README:libgcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append path:share/doc/libgcc/README:libgcc
</span> if {${os.platform} eq "darwin" && ${os.major} < 13} {
# prior to OS X Mavericks, libstdc++ was the default C++ runtime, so
# assume MacPorts libstdc++ must be ABI compatible with system libstdc++
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,7 +58,7 @@ if {${configure.cxx_stdlib} eq "libstdc++"} {
</span> }
# see https://trac.macports.org/ticket/54766
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append path:share/doc/libgcc/README:libgcc
</span>
compiler.blacklist-append \
macports-gcc-4.3 macports-gcc-4.4 macports-gcc-4.5 macports-gcc \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/launch4j/Portfile b/java/launch4j/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1f5ca70b6f1..53f8aa81b31 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/launch4j/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/launch4j/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +36,7 @@ checksums md5 089cbecf8f6aa022258044f3090b5cdf \
</span> # binary, not source, so we can't rebuild it. Instead we relink to our own
# library in case the prefix is not the default.
depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libgcc/libgcc_s.1.dylib:libgcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:share/doc/libgcc/README:libgcc
</span>
use_configure no
build {}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/g95/Portfile b/lang/g95/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cc772e94a85..114e1f24fa1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/g95/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/g95/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,7 +66,7 @@ checksums-append ${dg95} md5 f9552aef0975c1dcf70950b6e6b18ff1 \
</span> ${dg95} rmd160 98d03e9a1835f4b3553a72a798bdf1d90a757176
depends_build port:ld64 port:cctools port:libtool
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:libiconv path:lib/libgcc/libgcc_s.1.dylib:libgcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:libiconv path:share/doc/libgcc/README:libgcc
</span>
patchfiles patch-Makefile.in.diff \
patch-darwin.h.diff \
<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 f347284e89d..45abc990992 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;'>@@ -70,7 +70,7 @@ depends_lib port:cctools \
</span> port:mpfr \
port:zlib
depends_run port:gcc_select \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libgcc/libgcc_s.1.dylib:libgcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:share/doc/libgcc/README:libgcc
</span>
depends_skip_archcheck-append gcc_select ld64 cctools
license_noconflict gmp mpfr ppl libmpc zlib
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc7/Portfile b/lang/gcc7/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 07504e6e3bb..7ae6ee2e59d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,7 +53,7 @@ depends_lib port:cctools \
</span> port:mpfr
depends_run port:gcc_select
if { ${isLastSupported} } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append path:share/doc/libgcc/README:libgcc
</span> } else {
depends_run-append port:libgcc7
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc8/Portfile b/lang/gcc8/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 02a39f03772..e7dd847f5a2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +67,7 @@ depends_lib port:cctools \
</span> port:zlib
depends_run port:gcc_select
if { ${isLastSupported} } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append path:share/doc/libgcc/README:libgcc
</span> } else {
depends_run-append port:libgcc8
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc9/Portfile b/lang/gcc9/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c0223c05c7a..64481eb0f38 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc9/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc9/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -211,7 +211,7 @@ if {${subport} eq "libgcc9"} {
</span> # version should continue to provide a subport for that and older gcc
# versions.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run path:lib/libgcc/libgcc_s.1.dylib:libgcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run path:share/doc/libgcc/README:libgcc
</span> depends_build-append {*}${depends_lib}
depends_lib
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/upc/Portfile b/lang/upc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c2c6d4051d8..91d584d6eaa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/upc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/upc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +25,7 @@ checksums rmd160 d35ec1e77517f7e5edef7ae8b6880bfa1a206eb8 \
</span> depends_lib port:gmp port:mpfr port:libiconv port:libmpc \
port:isl14 \
port:ld64 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libgcc/libgcc_s.1.dylib:libgcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:share/doc/libgcc/README:libgcc
</span> depends_build port:gdb \
port:cctools
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/root5/Portfile b/science/root5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index aa0212df549..4d2e7cd9132 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/root5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/root5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -634,7 +634,7 @@ foreach ver ${gcc_versions} {
</span> set ver_no_dot [join [split ${ver} "."] ""]
if {[variant_isset gcc${ver_no_dot}]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append path:share/doc/libgcc/README:libgcc
</span> depends_build-append port:gcc${ver_no_dot}
configure.fc ${prefix}/bin/gfortran-mp-${ver}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/root6/Portfile b/science/root6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f7a75fb19a5..ea29fca8d78 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/root6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/root6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,7 +56,7 @@ set gcc_ver 10
</span> configure.fc ${prefix}/bin/gfortran-mp-${gcc_ver}
configure.f77 ${prefix}/bin/gfortran-mp-${gcc_ver}
configure.f90 ${prefix}/bin/gfortran-mp-${gcc_ver}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append path:share/doc/libgcc/README:libgcc
</span> depends_build-append port:gcc${gcc_ver}
compiler.blacklist-append *gcc* {clang < 920} {macports-clang-3.[0-9]} {macports-clang-[4-6].0}
</pre><pre style='margin:0'>
</pre>