<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/f45a7741d47c44a8a98bd781245ec485af375bf8">https://github.com/macports/macports-ports/commit/f45a7741d47c44a8a98bd781245ec485af375bf8</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 f45a7741d47 legacysupport PG 1.1: Small clean up in how options are {ap,pre}pended
</span>f45a7741d47 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit f45a7741d47c44a8a98bd781245ec485af375bf8
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Thu Apr 22 10:52:35 2021 +0100

<span style='display:block; white-space:pre;color:#404040;'>    legacysupport PG 1.1: Small clean up in how options are {ap,pre}pended
</span>---
 _resources/port1.0/group/legacysupport-1.1.tcl | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

<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 7fcfb536a84..88495b71900 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;'>@@ -66,9 +66,10 @@ proc legacysupport::get_dependency {} {
</span>     return path:lib/libMacportsLegacySupport.dylib:legacy-support
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc legacysupport::set_depends {} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    [legacysupport::get_depends_type]-delete [legacysupport::get_dependency]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    [legacysupport::get_depends_type]-append [legacysupport::get_dependency]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc legacysupport::add_once { opt where value } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    ui_debug "Will $where $value to $opt"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    ${opt}-delete   ${value}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    ${opt}-${where} ${value}
</span> }
 
 proc legacysupport::add_legacysupport {} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,14 +81,13 @@ 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;'>-        legacysupport::set_depends
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        legacysupport::add_once [legacysupport::get_depends_type] append [legacysupport::get_dependency]
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        configure.ldflags-delete    [option legacysupport.library_name]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        configure.ldflags-append    [option legacysupport.library_name]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # Add the library link flags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        legacysupport::add_once configure.ldflags append [option legacysupport.library_name]
</span> 
         if {![option compiler.limit_flags]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            configure.cppflags-delete   [option legacysupport.header_search]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            configure.cppflags-prepend  [option legacysupport.header_search]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            legacysupport::add_once configure.cppflags prepend [option legacysupport.header_search]
</span>         }
 
         # do not use compiler.cpath since it behaves like -I, while ${lang}_INCLUDE_PATH behaves like -isystem
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,8 +95,7 @@ proc legacysupport::add_legacysupport {} {
</span>         # see, e.g., llvm-devel
         foreach phase {configure build destroot test} {
             foreach lang {C OBJC CPLUS OBJCPLUS} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                ${phase}.env-delete ${lang}_INCLUDE_PATH=${prefix}/include/LegacySupport
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                ${phase}.env-append ${lang}_INCLUDE_PATH=${prefix}/include/LegacySupport
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                legacysupport::add_once ${phase}.env append ${lang}_INCLUDE_PATH=${prefix}/include/LegacySupport
</span>             }
         }
     }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,8 +103,7 @@ proc legacysupport::add_legacysupport {} {
</span>     # see https://trac.macports.org/ticket/59832
     if {${os.platform} eq "darwin" && [option configure.cxx_stdlib] eq "macports-libstdc++"} {
         foreach phase {configure build destroot test} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            ${phase}.env-delete    DYLD_LIBRARY_PATH=${prefix}/lib/libgcc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            ${phase}.env-append    DYLD_LIBRARY_PATH=${prefix}/lib/libgcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            legacysupport::add_once ${phase}.env append DYLD_LIBRARY_PATH=${prefix}/lib/libgcc
</span>         }
     }
 }
</pre><pre style='margin:0'>

</pre>