<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/0fd03dd87d1cf952a55ac51061d48234b1a0ca93">https://github.com/macports/macports-ports/commit/0fd03dd87d1cf952a55ac51061d48234b1a0ca93</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0fd03dd87d1cf952a55ac51061d48234b1a0ca93
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Feb 16 04:10:57 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> legacy-support: use makefile & muniversal 1.1 PGs
</span>---
devel/legacy-support/Portfile | 25 +++++--------------------
1 file changed, 5 insertions(+), 20 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/legacy-support/Portfile b/devel/legacy-support/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 79e3f9f1e5b..4e1748f752e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/legacy-support/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/legacy-support/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,8 @@
</span> PortSystem 1.0
PortGroup github 1.0
PortGroup clang_dependency 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup muniversal 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup makefile 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup muniversal 1.1
</span>
name legacy-support
categories devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,8 +44,6 @@ subport ${name}-devel {
</span> set release_ver [lindex ${v_split} 0].[lindex ${v_split} 1].99
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Until this can be fixed disable parallel builds...
# https://build.macports.org/builders/ports-10.10_x86_64-builder/builds/141962/steps/install-port/logs/stdio
use_parallel_build no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,17 +57,13 @@ post-extract {
</span> set max_darwin_reexport 19
set max_darwin_optool 20
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PREFIX=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append LD=ld \
</span> "LIPO=/usr/bin/lipo" \
PLATFORM=${os.major} \
MAX_DARWIN_REEXPORT=${max_darwin_reexport} \
SOCURVERSION=${release_ver} \
SOCOMPATVERSION=${compat_ver}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # install Tiger-specific fixes
platform darwin 8 {
# there is no system copyfile.h, so find local copy
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,18 +77,8 @@ platform darwin 8 {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${universal_possible} && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach arch ${universal_archs_supported} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_build_env(${arch}) "CXXFLAGS=${configure.cxxflags} [muniversal_get_arch_flag ${arch}]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CFLAGS=${configure.cflags} [muniversal_get_arch_flag ${arch}]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "LDFLAGS=${configure.ldflags} [muniversal_get_arch_flag ${arch}]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "FORCE_ARCH=${arch}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append "CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "FORCE_ARCH=${build_arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach arch ${muniversal.architectures} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env.${arch}-append FORCE_ARCH=${arch}
</span> }
test.env {*}${build.env}
</pre><pre style='margin:0'>
</pre>