<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/c6d937caf73904918e3c06d0b206a203bb78bfc7">https://github.com/macports/macports-ports/commit/c6d937caf73904918e3c06d0b206a203bb78bfc7</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 c6d937caf73 legacysupport PG: Add env vars documenting custum flags
</span>c6d937caf73 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c6d937caf73904918e3c06d0b206a203bb78bfc7
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Fri Apr 23 14:43:37 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> legacysupport PG: Add env vars documenting custum flags
</span>---
_resources/port1.0/group/legacysupport-1.1.tcl | 36 ++++++++++++++++----------
1 file changed, 23 insertions(+), 13 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 b9842a35cb5..408170ad5a4 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;'>@@ -21,7 +21,7 @@
</span>
# default to OS X El Capitan (OS X 10.11; Darwin 15) due to clock_gettime
options legacysupport.newest_darwin_requires_legacy
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default legacysupport.newest_darwin_requires_legacy 15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default legacysupport.newest_darwin_requires_legacy {[legacysupport::get_newest_darwin_with_missing_symbols]}
</span>
options legacysupport.header_search
default legacysupport.header_search {-isystem${prefix}/include/LegacySupport}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,6 +45,14 @@ if {![info exists compiler.limit_flags]} {
</span> namespace eval legacysupport {
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+proc legacysupport::get_newest_darwin_with_missing_symbols {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Returns the newest Darwin version for which the legacy support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # library generates missing symbols.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/macports/macports-legacy-support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Current Darwin 15 for clock_gettime
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> proc legacysupport::get_library_name {} {
global prefix
if {[option legacysupport.use_static]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,21 +80,23 @@ proc legacysupport::add_once { opt where value } {
</span> ${opt}-${where} ${value}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+proc legacysupport::set_phase_env_var { var } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach phase { extract configure build destroot test } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ legacysupport::add_once ${phase}.env append ${var}
</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 legacysupport::set_label_environment_vars { } {
global os.platform os.major
set env_name MACPORTS_LEGACY_SUPPORT_DISABLED
if {${os.platform} eq "darwin" && ${os.major} <= [option legacysupport.newest_darwin_requires_legacy]} {
set env_name MACPORTS_LEGACY_SUPPORT_ENABLED
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach phase { extract configure build destroot } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${phase}.env-append "${env_name}=1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ legacysupport::set_phase_env_var ${env_name}=1
</span> }
proc legacysupport::add_legacysupport {} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global prefix \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- os.platform \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- os.major
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global prefix os.platform os.major
</span>
if {${os.platform} eq "darwin" && ${os.major} <= [option legacysupport.newest_darwin_requires_legacy]} {
ui_debug "Adding legacy build support"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,18 +106,18 @@ proc legacysupport::add_legacysupport {} {
</span>
# Add the library link flags
legacysupport::add_once configure.ldflags append [option legacysupport.library_name]
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ legacysupport::set_phase_env_var MACPORTS_LEGACY_SUPPORT_LDFLAGS=-L${prefix}/lib\ [option legacysupport.library_name]
</span>
if {![option compiler.limit_flags]} {
legacysupport::add_once configure.cppflags prepend [option legacysupport.header_search]
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ legacysupport::set_phase_env_var MACPORTS_LEGACY_SUPPORT_CPPFLAGS=[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:#ffe0e0;'>- # since legacy-support uses GNU language extensions, this prevents warnings when `-pedantic` is used and error when `-pedantic-errors` is used.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see, e.g., llvm-devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach phase {configure build destroot test} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach lang {C OBJC CPLUS OBJCPLUS} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- legacysupport::add_once ${phase}.env append ${lang}_INCLUDE_PATH=${prefix}/include/LegacySupport
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # since legacy-support uses GNU language extensions, this prevents warnings when `-pedantic` is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # used and error when `-pedantic-errors` is used. see, e.g., llvm-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach lang {C OBJC CPLUS OBJCPLUS} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ legacysupport::set_phase_env_var ${lang}_INCLUDE_PATH=${prefix}/include/LegacySupport
</span> }
}
</pre><pre style='margin:0'>
</pre>