<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/710634591ace93ea43246efd24bfb37796cf7cf1">https://github.com/macports/macports-ports/commit/710634591ace93ea43246efd24bfb37796cf7cf1</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 710634591ac legacysupport PGs: Make legacysupport port a build_dep when linked statically
</span>710634591ac is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 710634591ace93ea43246efd24bfb37796cf7cf1
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Thu Apr 22 00:29:04 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> legacysupport PGs: Make legacysupport port a build_dep when linked statically
</span>---
_resources/port1.0/group/legacysupport-1.0.tcl | 13 +++++++++++--
_resources/port1.0/group/legacysupport-1.1.tcl | 20 ++++++++++++++++++--
2 files changed, 29 insertions(+), 4 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 a6ed39d0aac..ed150270a75 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;'>@@ -12,6 +12,14 @@ default legacysupport.newest_darwin_requires_legacy 15
</span> options legacysupport.use_static
default legacysupport.use_static no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+proc get_legacysupport_depends_type {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[option legacysupport.use_static]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return depends_build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return depends_lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> proc add_legacysupport {} {
global prefix \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +36,8 @@ proc add_legacysupport {} {
</span> # Delete everything first to avoid duplicate values
# port dependency
<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:#e0ffe0;'>+ set legacy_dep path:lib/libMacportsLegacySupport.dylib:legacy-support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [get_legacysupport_depends_type]-delete ${legacy_dep}
</span>
# configure options
configure.ldflags-delete ${AddLDFlag}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,7 +55,7 @@ proc add_legacysupport {} {
</span> ui_debug "Adding legacy build support"
# Depend on the support library or devel version if installed
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:lib/libMacportsLegacySupport.dylib:legacy-support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [get_legacysupport_depends_type]-append ${legacy_dep}
</span>
# Add to configure options
if {[option legacysupport.use_static]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/legacysupport-1.1.tcl b/_resources/port1.0/group/legacysupport-1.1.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 3284dd7d4e8..7fcfb536a84 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/legacysupport-1.1.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/legacysupport-1.1.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,6 +54,23 @@ proc legacysupport::get_library_name {} {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+proc legacysupport::get_depends_type {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[option legacysupport.use_static]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return depends_build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return depends_lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc legacysupport::get_dependency {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc legacysupport::set_depends {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [legacysupport::get_depends_type]-delete [legacysupport::get_dependency]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [legacysupport::get_depends_type]-append [legacysupport::get_dependency]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> proc legacysupport::add_legacysupport {} {
global prefix \
os.platform \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,8 +80,7 @@ proc legacysupport::add_legacysupport {} {
</span> ui_debug "Adding legacy build support"
# depend on the support library or devel version if installed
<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;'>- depends_lib-append path:lib/libMacportsLegacySupport.dylib:legacy-support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ legacysupport::set_depends
</span>
configure.ldflags-delete [option legacysupport.library_name]
configure.ldflags-append [option legacysupport.library_name]
</pre><pre style='margin:0'>
</pre>