<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5fe34a0f2e78a40243afe2fe631757440831a8f5">https://github.com/macports/macports-ports/commit/5fe34a0f2e78a40243afe2fe631757440831a8f5</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 5fe34a0 legacysupport pg: avoid duplicate deps, flags, etc
</span>5fe34a0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5fe34a0f2e78a40243afe2fe631757440831a8f5
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Dec 12 10:29:54 2019 +1100
<span style='display:block; white-space:pre;color:#404040;'> legacysupport pg: avoid duplicate deps, flags, etc
</span>---
_resources/port1.0/group/legacysupport-1.0.tcl | 34 +++++++++++++-------------
1 file changed, 17 insertions(+), 17 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/legacysupport-1.0.tcl b/_resources/port1.0/group/legacysupport-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 9a3d30d..a472d9d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/legacysupport-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/legacysupport-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,9 +10,9 @@ default legacysupport.newest_darwin_requires_legacy 15
</span>
proc add_legacysupport {} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global prefix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global os.platform os.major
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global legacysupport.newest_darwin_requires_legacy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global prefix \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os.platform os.major \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ legacysupport.newest_darwin_requires_legacy
</span>
set MPLegacyIncDir ${prefix}/include/LegacySupport
set AddLDFlag -lMacportsLegacySupport
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,6 +20,20 @@ proc add_legacysupport {} {
</span> set AddCIncPath C_INCLUDE_PATH=${MPLegacyIncDir}
set AddCppIncPath CPLUS_INCLUDE_PATH=${MPLegacyIncDir}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Delete everything first to avoid duplicate values
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # port dependency
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete path:lib/libMacportsLegacySupport.dylib:legacy-support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # configure options
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-delete ${AddLDFlag}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cflags-delete ${AddCFlag}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-delete ${AddCFlag}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Include Dirs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-delete ${AddCIncPath} ${AddCppIncPath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-delete ${AddCIncPath} ${AddCppIncPath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${os.platform} eq "darwin" && ${os.major} <= ${legacysupport.newest_darwin_requires_legacy}} {
# Add Build Support
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,19 +57,6 @@ proc add_legacysupport {} {
</span>
# Remove build support
ui_debug "Removing legacy build support"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # port dependency
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete path:lib/libMacportsLegacySupport.dylib:legacy-support
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # configure options
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-delete ${AddLDFlag}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cflags-delete ${AddCFlag}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cppflags-delete ${AddCFlag}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Include Dirs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-delete ${AddCIncPath} ${AddCppIncPath}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-delete ${AddCIncPath} ${AddCppIncPath}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,4 +68,3 @@ proc add_legacysupport {} {
</span> # indicating being declared twice in port lint --nitpick
add_legacysupport
port::register_callback add_legacysupport
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>