<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/bf28c26870a622997dfe3125958175e37732c1d2">https://github.com/macports/macports-ports/commit/bf28c26870a622997dfe3125958175e37732c1d2</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 bf28c26 godot: Fix dependencies in clang variants, make clang9 default on < Darwin14
</span>bf28c26 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bf28c26870a622997dfe3125958175e37732c1d2
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Sat May 16 16:17:11 2020 +0100
<span style='display:block; white-space:pre;color:#404040;'> godot: Fix dependencies in clang variants, make clang9 default on < Darwin14
</span>---
games/godot/Portfile | 50 +++++++++++++++++++++++++++++++++++++-------------
1 file changed, 37 insertions(+), 13 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/godot/Portfile b/games/godot/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index da32239..2ff67e6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/godot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/godot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,11 +4,16 @@ PortSystem 1.0
</span> PortGroup github 1.0
github.setup godotengine godot 3.2.1 "" -stable
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories games graphics multimedia
platforms darwin
license MIT
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> maintainers @jasonliu-- openmaintainer
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> homepage https://godotengine.org
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> description cross-platform 2-D and 3-D game development \
environment
long_description Godot Engine is a cross-platform game engine for \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,10 +45,11 @@ compiler.cxx_standard 2014
</span> use_configure no
use_xcode yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.cmd scons
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env BUILD_NAME=macports_build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.cmd ${prefix}/bin/scons
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append BUILD_NAME=macports_build
</span> build.target platform=osx target=release_debug
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> destroot {
copy ${worksrcpath}/misc/dist/osx_tools.app \
${destroot}${applications_dir}/Godot.app
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,6 +79,20 @@ foreach s ${clang_suffixes} {
</span> lappend clang_ports clang${s}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# error: invalid value 'gnu++14' in '-std=gnu++14'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.major} <= 13 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set has_clang_variant no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach s ${clang_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [variant_isset clang${s}] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set has_clang_variant yes
</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;'>+ if { !${has_clang_variant} } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Use most recent clang by default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +clang[lindex ${clang_suffixes} end]
</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> foreach s ${clang_suffixes} {
global use_xcode sconstruct_default_mp_clang
set p clang${s}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,17 +103,20 @@ foreach s ${clang_suffixes} {
</span> }
set i [lsearch -exact ${clang_ports} ${p}]
set c [lreplace ${clang_ports} ${i} ${i}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant ${p} conflicts {*}${c} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description "Build using the MacPorts Clang ${v} compiler" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:clang-${v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${p} conflicts {*}${c} description "Build using the MacPorts Clang ${v} compiler" {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [variant_isset ${p}] } {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.whitelist macports-clang-${v}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_xcode no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set selected_clang_v ${v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set selected_clang_s ${s}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set selected_clang_p ${p}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:clang-${selected_clang_v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.whitelist macports-clang-${selected_clang_v}
</span>
post-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${s} != ${sconstruct_default_mp_clang}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace s|${sconstruct_default_mp_clang}\.0|${v}|g \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${selected_clang_s} != ${sconstruct_default_mp_clang}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace s|${sconstruct_default_mp_clang}\.0|${selected_clang_v}|g \
</span> ${worksrcpath}/SConstruct
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -102,11 +125,11 @@ foreach s ${clang_suffixes} {
</span> # * https://trac.macports.org/ticket/58779#comment:28
ui_warn "
****
<span style='display:block; white-space:pre;background:#ffe0e0;'>-**** Installing port ${name} with variant +${p} uses
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+**** Installing port ${name} with variant +${selected_clang_p} uses
</span> **** MacPorts Clang instead of Xcode Clang. It also
**** circumvents the Xcode toolchain, which means that
**** if you attempt to perform a build using trace mode
<span style='display:block; white-space:pre;background:#ffe0e0;'>-**** (port -t install ${name} +${p}), the build will
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+**** (port -t install ${name} +${selected_clang_p}), the build will
</span> **** fail!
****
**** If you are not using trace mode, you can safely
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -114,6 +137,7 @@ foreach s ${clang_suffixes} {
</span> ****
"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append macports_clang=${v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append macports_clang=${selected_clang_v}
</span> }
}
</pre><pre style='margin:0'>
</pre>