<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7903b8654558f06d713b849a0984fdaa599b7df9">https://github.com/macports/macports-ports/commit/7903b8654558f06d713b849a0984fdaa599b7df9</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 7903b8654558f06d713b849a0984fdaa599b7df9
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Oct 6 10:44:30 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> gcc*: trim dependencies
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See https://lists.macports.org/pipermail/macports-dev/2018-August/039218.html
</span>---
lang/gcc43/Portfile | 7 +++----
lang/gcc44/Portfile | 7 +++----
lang/gcc45/Portfile | 15 ++++++++-------
lang/gcc46/Portfile | 4 ++--
lang/gcc47/Portfile | 4 ++--
lang/gcc48/Portfile | 4 ++--
lang/gcc49/Portfile | 4 ++--
lang/gcc5/Portfile | 4 ++--
lang/gcc6/Portfile | 17 +++++++++--------
lang/gcc7/Portfile | 42 ++++++++++++++++++++++++++----------------
lang/gcc8/Portfile | 15 +++++++++------
lang/gcc9/Portfile | 15 +++++++++------
12 files changed, 77 insertions(+), 61 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc43/Portfile b/lang/gcc43/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index aa1a9d8..f7c46de 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc43/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc43/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup compiler_blacklist_versions 1.0
</span>
name gcc43
version 4.3.6
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 14
</span> platforms darwin
categories lang
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,12 +57,11 @@ checksums gcc-core-${version}.tar.bz2 \
</span> depends_lib port:cctools \
port:gmp \
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;'>+ port:zlib \
</span> port:libiconv \
port:mpfr
depends_run port:gcc_select \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libgcc45 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libgcc6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libgcc45
</span>
depends_skip_archcheck-append gcc_select ld64 cctools
license_noconflict gmp mpfr
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc44/Portfile b/lang/gcc44/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fb2fd1b..03eb88e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc44/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc44/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup compiler_blacklist_versions 1.0
</span> name gcc44
epoch 1
version 4.4.7
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 13
</span> platforms darwin
categories lang
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,12 +58,11 @@ checksums gcc-core-${version}.tar.bz2 \
</span> depends_lib port:cctools \
port:gmp \
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;'>+ port:zlib \
</span> port:libiconv \
port:mpfr
depends_run port:gcc_select \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libgcc45 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libgcc6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libgcc45
</span>
depends_skip_archcheck-append gcc_select ld64 cctools
license_noconflict gmp mpfr
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc45/Portfile b/lang/gcc45/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a31d558..9336bd7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc45/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc45/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,8 +8,8 @@ name gcc45
</span> # Whenever this port is bumped for version/revision, please revbump dragonegg-3.4-gcc-4.5
epoch 1
version 4.5.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 14
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-subport libgcc45 { revision 15 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport libgcc45 { revision 16 }
</span> platforms darwin
categories lang
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,13 +72,12 @@ depends_build bin:makeinfo:texinfo
</span> depends_lib port:cctools \
port:gmp \
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;'>+ port:zlib \
</span> port:libiconv \
port:libmpc \
port:mpfr
depends_run port:gcc_select \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libgcc45 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libgcc6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libgcc45
</span>
depends_skip_archcheck-append texinfo gcc_select ld64 cctools
license_noconflict gmp mpfr ppl libmpc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -151,6 +150,7 @@ configure.env-append \
</span> OTOOL64=${prefix}/bin/otool
if {${os.platform} eq "darwin" && ([vercmp $xcodeversion 9.0] > 0)} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build
</span> depends_lib
depends_run
archive_sites
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -217,8 +217,9 @@ if {${subport} == "libgcc45"} {
</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-delete port:libgcc45
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run-delete port:libgcc6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run port:libgcc6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append {*}${depends_lib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib
</span>
configure.args-replace \
--libdir=${prefix}/lib/${name} \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc46/Portfile b/lang/gcc46/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8d6a8ab..e0185b0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc46/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc46/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ name gcc46
</span> # Whenever this port is bumped for version/revision, please revbump dragonegg-3.4-gcc-4.6
epoch 1
version 4.6.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 13
</span> platforms darwin
categories lang
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,7 +53,7 @@ depends_lib port:cctools \
</span> path:lib/pkgconfig/cloog-isl.pc:cloog \
port:gmp \
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;'>+ port:zlib \
</span> port:libiconv \
port:libmpc \
port:mpfr \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc47/Portfile b/lang/gcc47/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 009da14..580bfa4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc47/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc47/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ name gcc47
</span> # Whenever this port is bumped for version/revision, please revbump dragonegg-3.4-gcc-4.7
epoch 1
version 4.7.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 10
</span> platforms darwin
categories lang
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,7 +52,7 @@ depends_lib port:cctools \
</span> path:lib/pkgconfig/cloog-isl.pc:cloog \
port:gmp \
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;'>+ port:zlib \
</span> port:libiconv \
port:libmpc \
port:mpfr \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc48/Portfile b/lang/gcc48/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e09ef21..b9b628f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc48/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc48/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ name gcc48
</span> # Whenever this port is bumped for version/revision, please revbump dragonegg-3.4-gcc-4.8
epoch 2
version 4.8.5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> platforms darwin
categories lang
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,7 @@ depends_lib port:cctools \
</span> port:gmp \
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;'>+ port:zlib \
</span> port:libiconv \
port:libmpc \
port:mpfr
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc49/Portfile b/lang/gcc49/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 71fcd6a..c2440c1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc49/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc49/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup compiler_blacklist_versions 1.0
</span> name gcc49
epoch 2
version 4.9.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> platforms darwin
categories lang
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +36,7 @@ depends_lib port:cctools \
</span> port:gmp \
path:lib/pkgconfig/isl.pc:isl \
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;'>+ port:zlib \
</span> port:libiconv \
port:libmpc \
port:mpfr
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc5/Portfile b/lang/gcc5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0d60faf..81da21e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup compiler_blacklist_versions 1.0
</span> name gcc5
epoch 2
version 5.5.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> platforms darwin
categories lang
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,7 +51,7 @@ depends_lib port:cctools \
</span> port:gmp \
path:lib/pkgconfig/isl.pc:isl \
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;'>+ port:zlib \
</span> port:libiconv \
port:libmpc \
port:mpfr
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc6/Portfile b/lang/gcc6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0853084..c0009eb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,8 +7,8 @@ PortGroup compiler_blacklist_versions 1.0
</span> name gcc6
epoch 2
version 6.4.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-subport libgcc6 { revision 4 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport libgcc6 { revision 5 }
</span> platforms darwin
categories lang
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,11 +36,12 @@ depends_lib port:cctools \
</span> port:gmp \
path:lib/pkgconfig/isl.pc:isl \
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:#ffe0e0;'>- port:libgcc7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib \
</span> port:libiconv \
port:libmpc \
port:mpfr
<span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run port:gcc_select \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libgcc6
</span>
depends_skip_archcheck-append gcc_select ld64 cctools
license_noconflict gmp mpfr ppl libmpc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -162,6 +163,10 @@ if {${subport} eq "libgcc6"} {
</span> # version should continue to provide a subport for that and older gcc
# versions.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run port:libgcc7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append {*}${depends_lib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-replace \
--libdir=${prefix}/lib/${name} \
--libdir=${prefix}/lib/libgcc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -227,10 +232,6 @@ if {${subport} eq "libgcc6"} {
</span> }
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run-append port:gcc_select \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libgcc6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-destroot {
file delete ${destroot}${prefix}/share/info/dir
<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 52084df..8dcba1a 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;'>@@ -7,8 +7,8 @@ PortGroup compiler_blacklist_versions 1.0
</span> name gcc7
epoch 2
version 7.3.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-subport libgcc7 { revision 2 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport libgcc7 { revision 3 }
</span> platforms darwin
categories lang
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,14 +32,26 @@ checksums rmd160 31f6934a0e0c0ca84b6668110f9afdb91c1f9023 \
</span> sha256 832ca6ae04636adbb430e865a1451adf6979ab44ca1c8374f61fba65645ce15c \
size 62462388
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Check if this is the last supported gcc version for this system.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# If it is, libgcc7 installs a full runtime, otherwise it only installs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# what is missing from newer libgccX builds.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# NOTE : The logic here must match that in the libgcc port.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set isLastSupported [ expr ${os.major} < 10 ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib port:cctools \
port:gmp \
path:lib/pkgconfig/isl.pc:isl \
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;'>+ port:zlib \
</span> port:libiconv \
port:libmpc \
port:mpfr
<span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run port:gcc_select
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${isLastSupported} } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run-append port:libgcc7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
depends_skip_archcheck-append gcc_select ld64 cctools
license_noconflict gmp mpfr ppl libmpc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -151,16 +163,6 @@ use_parallel_build yes
</span>
destroot.target install install-info-host
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Check if this is the last supported gcc version for this system.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# If it is, libgcc7 installs a full runtime, otherwise it only installs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# what is missing from newer libgccX builds.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# NOTE : The logic here must match that in the libgcc port.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set isLastSupported [ expr ${os.major} < 10 ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${isLastSupported} } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Don't depend on libgcc, as libgcc7 is libgcc
</span><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;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {${subport} eq "libgcc7"} {
# Activate hack for new libgcc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -188,6 +190,17 @@ if {${subport} eq "libgcc7"} {
</span> # version should continue to provide a subport for that and older gcc
# versions.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${isLastSupported} } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append {*}${depends_lib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run port:libgcc8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append {*}${depends_lib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-replace \
--libdir=${prefix}/lib/${name} \
--libdir=${prefix}/lib/libgcc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -273,9 +286,6 @@ if {${subport} eq "libgcc7"} {
</span> }
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run-append port:gcc_select port:libgcc7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-destroot {
file delete ${destroot}${prefix}/share/info/dir
<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 678c939..d6a46f4 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;'>@@ -7,8 +7,8 @@ PortGroup compiler_blacklist_versions 1.0
</span> epoch 2
name gcc8
version 8.2.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-subport libgcc8 { revision 0 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport libgcc8 { revision 1 }
</span> platforms darwin
categories lang
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,6 +40,8 @@ depends_lib port:cctools \
</span> port:libmpc \
port:mpfr \
port:zlib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run port:gcc_select \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/libgcc/libgcc_s.1.dylib:libgcc
</span>
depends_skip_archcheck-append gcc_select ld64 cctools
license_noconflict gmp mpfr ppl libmpc zlib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -188,6 +190,11 @@ if {${subport} eq "libgcc8"} {
</span> # version should continue to provide a subport for that and older gcc
# versions.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append {*}${depends_lib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-replace \
--libdir=${prefix}/lib/${name} \
--libdir=${prefix}/lib/libgcc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -259,10 +266,6 @@ if {${subport} eq "libgcc8"} {
</span> }
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run-append port:gcc_select
</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:#ffe0e0;'>-
</span> post-destroot {
file delete ${destroot}${prefix}/share/info/dir
<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 4530ffd..ee1fc431 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;'>@@ -7,8 +7,8 @@ PortGroup compiler_blacklist_versions 1.0
</span> epoch 2
name gcc9
version 9-20180722
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-subport libgcc-devel { revision 0 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport libgcc-devel { revision 1 }
</span> platforms darwin
categories lang
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,6 +40,8 @@ depends_lib port:cctools \
</span> port:libmpc \
port:mpfr \
port:zlib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run port:gcc_select \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libgcc-devel
</span>
depends_skip_archcheck-append gcc_select ld64 cctools
license_noconflict gmp mpfr ppl libmpc zlib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -166,6 +168,11 @@ if {${subport} eq "libgcc-devel"} {
</span> # version should continue to provide a subport for that and older gcc
# versions.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append {*}${depends_lib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-replace \
--libdir=${prefix}/lib/${name} \
--libdir=${prefix}/lib/libgcc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -237,10 +244,6 @@ if {${subport} eq "libgcc-devel"} {
</span> }
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run-append port:gcc_select
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:libgcc-devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-destroot {
file delete ${destroot}${prefix}/share/info/dir
</pre><pre style='margin:0'>
</pre>