<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/306860dcccab69e399c8658a3d09b3727c1d352a">https://github.com/macports/macports-ports/commit/306860dcccab69e399c8658a3d09b3727c1d352a</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 306860dccca gccN-libcxx: Disable universal variants
</span>306860dccca is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 306860dcccab69e399c8658a3d09b3727c1d352a
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Fri Nov 18 10:57:23 2022 +0000
<span style='display:block; white-space:pre;color:#404040;'> gccN-libcxx: Disable universal variants
</span>---
lang/gcc-devel/Portfile | 88 ++++++++++++++++++++++++++-----------------------
lang/gcc10/Portfile | 88 ++++++++++++++++++++++++++-----------------------
lang/gcc11/Portfile | 88 ++++++++++++++++++++++++++-----------------------
lang/gcc12/Portfile | 88 ++++++++++++++++++++++++++-----------------------
4 files changed, 184 insertions(+), 168 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 b9ab0444abd..08a78f00f97 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;'>@@ -474,54 +474,58 @@ if {${subport} eq ${name}} {
</span>
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Ensure all dylibs in destroot have our extra rpath added ..
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/65503
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach dlib [ exec find ${destroot}${prefix} -type f -and -name "*.dylib" ] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "Ensuring DYLIB '${dlib}' has RPATH '${mp_extra_rpath}'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Note install_name_tool returns a failure if the dylib already has the entry
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # We don't want that here so force final status to be true...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "install_name_tool -add_rpath ${mp_extra_rpath} ${dlib} > /dev/null 2>&1 ; true"
</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;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Ensure all dylibs in destroot have our extra rpath added ..
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/65503
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach dlib [ exec find ${destroot}${prefix} -type f -and -name "*.dylib" ] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "Ensuring DYLIB '${dlib}' has RPATH '${mp_extra_rpath}'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Note install_name_tool returns a failure if the dylib already has the entry
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # We don't want that here so force final status to be true...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -add_rpath ${mp_extra_rpath} ${dlib} > /dev/null 2>&1 ; true"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platform powerpc {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.universal_archs ppc ppc64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.platform} eq "darwin" && ${os.major} >= 20 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platform i386 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.universal_archs x86_64 arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform powerpc {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_archs ppc ppc64
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- platform arm {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.universal_archs x86_64 arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.platform} eq "darwin" && ${os.major} >= 20 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform i386 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_archs x86_64 arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform arm {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_archs x86_64 arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform i386 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_archs i386 x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platform i386 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.universal_archs i386 x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant universal {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --disable-multilib
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the generated compiler doesn't accept -arch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPP=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPP_FOR_BUILD=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPP=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPP_FOR_BUILD=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cc-append [get_canonical_archflags]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cc_archflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxx-append ${configure.cxx_archflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxx_archflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.objc_archflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ld_archflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_cflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_cxxflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_ldflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant universal {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-multilib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# the generated compiler doesn't accept -arch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CPP=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CPP_FOR_BUILD=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CPP=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CPP_FOR_BUILD=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cc-append [get_canonical_archflags]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cc_archflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cxx-append ${configure.cxx_archflags}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cxx_archflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.objc_archflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ld_archflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.universal_cflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.universal_cxxflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.universal_ldflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.universal_args
</span>
livecheck.type regex
livecheck.url ftp://gcc.gnu.org/pub/gcc/snapshots/
<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 bfef57a274e..6a2223b6eae 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;'>@@ -461,54 +461,58 @@ if {${subport} eq ${name}} {
</span>
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Ensure all dylibs in destroot have our extra rpath added ..
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/65503
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach dlib [ exec find ${destroot}${prefix} -type f -and -name "*.dylib" ] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "Ensuring DYLIB '${dlib}' has RPATH '${mp_extra_rpath}'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Note install_name_tool returns a failure if the dylib already has the entry
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # We don't want that here so force final status to be true...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "install_name_tool -add_rpath ${mp_extra_rpath} ${dlib} > /dev/null 2>&1 ; true"
</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;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Ensure all dylibs in destroot have our extra rpath added ..
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/65503
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach dlib [ exec find ${destroot}${prefix} -type f -and -name "*.dylib" ] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "Ensuring DYLIB '${dlib}' has RPATH '${mp_extra_rpath}'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Note install_name_tool returns a failure if the dylib already has the entry
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # We don't want that here so force final status to be true...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -add_rpath ${mp_extra_rpath} ${dlib} > /dev/null 2>&1 ; true"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platform powerpc {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.universal_archs ppc ppc64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.platform} eq "darwin" && ${os.major} >= 20 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platform i386 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.universal_archs x86_64 arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform powerpc {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_archs ppc ppc64
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- platform arm {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.universal_archs x86_64 arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.platform} eq "darwin" && ${os.major} >= 20 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform i386 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_archs x86_64 arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform arm {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_archs x86_64 arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform i386 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_archs i386 x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platform i386 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.universal_archs i386 x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant universal {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --disable-multilib
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the generated compiler doesn't accept -arch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPP=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPP_FOR_BUILD=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPP=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPP_FOR_BUILD=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cc-append [get_canonical_archflags]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cc_archflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxx-append ${configure.cxx_archflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxx_archflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.objc_archflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ld_archflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_cflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_cxxflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_ldflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant universal {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-multilib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# the generated compiler doesn't accept -arch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CPP=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CPP_FOR_BUILD=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CPP=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CPP_FOR_BUILD=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cc-append [get_canonical_archflags]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cc_archflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cxx-append ${configure.cxx_archflags}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cxx_archflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.objc_archflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ld_archflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.universal_cflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.universal_cxxflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.universal_ldflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.universal_args
</span>
livecheck.type regex
#livecheck.url https://ftp.gnu.org/gnu/gcc/
<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 622e6c20ace..b6f15c72194 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;'>@@ -482,54 +482,58 @@ if {${subport} eq ${name}} {
</span>
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Ensure all dylibs in destroot have our extra rpath added ..
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/65503
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach dlib [ exec find ${destroot}${prefix} -type f -and -name "*.dylib" ] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "Ensuring DYLIB '${dlib}' has RPATH '${mp_extra_rpath}'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Note install_name_tool returns a failure if the dylib already has the entry
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # We don't want that here so force final status to be true...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "install_name_tool -add_rpath ${mp_extra_rpath} ${dlib} > /dev/null 2>&1 ; true"
</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;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Ensure all dylibs in destroot have our extra rpath added ..
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/65503
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach dlib [ exec find ${destroot}${prefix} -type f -and -name "*.dylib" ] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "Ensuring DYLIB '${dlib}' has RPATH '${mp_extra_rpath}'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Note install_name_tool returns a failure if the dylib already has the entry
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # We don't want that here so force final status to be true...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -add_rpath ${mp_extra_rpath} ${dlib} > /dev/null 2>&1 ; true"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platform powerpc {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.universal_archs ppc ppc64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.platform} eq "darwin" && ${os.major} >= 20 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platform i386 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.universal_archs x86_64 arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform powerpc {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_archs ppc ppc64
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- platform arm {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.universal_archs x86_64 arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.platform} eq "darwin" && ${os.major} >= 20 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform i386 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_archs x86_64 arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform arm {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_archs x86_64 arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform i386 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_archs i386 x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platform i386 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.universal_archs i386 x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant universal {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --disable-multilib
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the generated compiler doesn't accept -arch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPP=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPP_FOR_BUILD=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPP=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPP_FOR_BUILD=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cc-append [get_canonical_archflags]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cc_archflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxx-append ${configure.cxx_archflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxx_archflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.objc_archflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ld_archflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_cflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_cxxflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_ldflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant universal {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-multilib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# the generated compiler doesn't accept -arch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CPP=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CPP_FOR_BUILD=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CPP=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CPP_FOR_BUILD=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cc-append [get_canonical_archflags]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cc_archflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cxx-append ${configure.cxx_archflags}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cxx_archflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.objc_archflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ld_archflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.universal_cflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.universal_cxxflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.universal_ldflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.universal_args
</span>
livecheck.type regex
#livecheck.url https://ftp.gnu.org/gnu/gcc/
<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 d5f5dae4e81..2198afa71b9 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;'>@@ -462,54 +462,58 @@ if {${subport} eq ${name}} {
</span>
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Ensure all dylibs in destroot have our extra rpath added ..
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/65503
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach dlib [ exec find ${destroot}${prefix} -type f -and -name "*.dylib" ] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "Ensuring DYLIB '${dlib}' has RPATH '${mp_extra_rpath}'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Note install_name_tool returns a failure if the dylib already has the entry
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # We don't want that here so force final status to be true...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "install_name_tool -add_rpath ${mp_extra_rpath} ${dlib} > /dev/null 2>&1 ; true"
</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;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Ensure all dylibs in destroot have our extra rpath added ..
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/65503
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach dlib [ exec find ${destroot}${prefix} -type f -and -name "*.dylib" ] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "Ensuring DYLIB '${dlib}' has RPATH '${mp_extra_rpath}'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Note install_name_tool returns a failure if the dylib already has the entry
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # We don't want that here so force final status to be true...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -add_rpath ${mp_extra_rpath} ${dlib} > /dev/null 2>&1 ; true"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platform powerpc {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.universal_archs ppc ppc64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.platform} eq "darwin" && ${os.major} >= 20 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platform i386 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.universal_archs x86_64 arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform powerpc {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_archs ppc ppc64
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- platform arm {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.universal_archs x86_64 arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.platform} eq "darwin" && ${os.major} >= 20 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform i386 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_archs x86_64 arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform arm {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_archs x86_64 arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform i386 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_archs i386 x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platform i386 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.universal_archs i386 x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant universal {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --disable-multilib
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the generated compiler doesn't accept -arch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPP=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPP_FOR_BUILD=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPP=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPP_FOR_BUILD=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cc-append [get_canonical_archflags]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cc_archflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxx-append ${configure.cxx_archflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxx_archflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.objc_archflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ld_archflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_cflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_cxxflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_ldflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant universal {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-multilib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# the generated compiler doesn't accept -arch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CPP=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CPP_FOR_BUILD=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CPP=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CPP_FOR_BUILD=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cc-append [get_canonical_archflags]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cc_archflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cxx-append ${configure.cxx_archflags}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cxx_archflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.objc_archflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ld_archflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.universal_cflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.universal_cxxflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.universal_ldflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.universal_args
</span>
livecheck.type regex
livecheck.url http://mirror.koddos.net/gcc/releases/
</pre><pre style='margin:0'>
</pre>