<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/ed352751afc52a036f329e7d34d418d367cf6cb5">https://github.com/macports/macports-ports/commit/ed352751afc52a036f329e7d34d418d367cf6cb5</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ed352751afc52a036f329e7d34d418d367cf6cb5
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Sun Jul 17 16:38:55 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> gcc-devel: portfile cleanup
</span><span style='display:block; white-space:pre;color:#404040;'> Also correct libgcc-devel conflict to be on libgcc12
</span>---
lang/gcc-devel/Portfile | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 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 a7d6ba3df62..b4eaa91c98f 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;'>@@ -18,8 +18,8 @@ maintainers nomaintainer
</span> # an exception in the license allows dependents to not be GPL
license {GPL-3+ Permissive}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description The GNU compiler collection, prerelease BETA snapshot.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description The GNU compiler collection, including front ends for \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description The GNU compiler collection
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description {*}${description}, including front ends for \
</span> C, C++, Objective-C, Objective-C++ and Fortran. \
This is an !experimental!, !BETA! version \
built from GCC snapshots.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,14 +93,13 @@ depends_run-append port:gcc_select \
</span> depends_skip_archcheck-append gcc_select ld64 cctools
license_noconflict gmp mpfr ppl libmpc zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set major [lindex [split ${version} .-] 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# For release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#set major [lindex [split ${version} .-] 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# For devel builds
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set major devel
</span>
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${build_arch} eq "arm64" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pre_args-append --build=aarch64-apple-darwin${os.major}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pre_args-append --build=${build_arch}-apple-darwin${os.major}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pre_args-append --build=${build_arch}-apple-darwin${os.major}
</span> }
set gcc_configure_langs {c c++ objc obj-c++ lto fortran}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -123,11 +122,11 @@ configure.args --enable-languages=[join ${gcc_configure_langs} ","] \
</span> --includedir=${prefix}/include/${name} \
--infodir=${prefix}/share/info \
--mandir=${prefix}/share/man \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --datarootdir=${prefix}/share/gcc-devel \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --datarootdir=${prefix}/share/gcc-${major} \
</span> --with-local-prefix=${prefix} \
--with-system-zlib \
--disable-nls \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --program-suffix=-mp-devel \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --program-suffix=-mp-${major} \
</span> --with-gxx-include-dir=${prefix}/include/${name}/c++/ \
--with-gmp=${prefix} \
--with-mpfr=${prefix} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -272,7 +271,7 @@ if {${subport} ne ${name}} {
</span> if { ${os.major} < 10 } {
conflicts libgcc libgcc7
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts libgcc libgcc10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts libgcc libgcc12
</span> }
# http://trac.macports.org/ticket/35770
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -288,7 +287,7 @@ if {${subport} ne ${name}} {
</span> # versions.
depends_run
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete port:zlib port:libiconv
</span> depends_build-append {*}${depends_lib}
depends_lib port:zlib port:libiconv
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -375,7 +374,7 @@ if {${subport} ne ${name}} {
</span>
foreach file [glob ${destroot}${prefix}/share/{info,man/man7}/*] {
set extension [file extension ${file}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set newfile [regsub "${extension}$" ${file} "-mp-devel${extension}"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set newfile [regsub "${extension}$" ${file} "-mp-${major}${extension}"]
</span> file rename ${file} ${newfile}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -443,4 +442,5 @@ configure.universal_args
</span>
livecheck.type regex
livecheck.url ftp://gcc.gnu.org/pub/gcc/snapshots/
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set major [lindex [split ${version} .-] 0]
</span> livecheck.regex LATEST-${major} -> (${major}-\[0-9\]+)
</pre><pre style='margin:0'>
</pre>