<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7f33355756b7da4bf73024dcb7f88c25cea34107">https://github.com/macports/macports-ports/commit/7f33355756b7da4bf73024dcb7f88c25cea34107</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 7f33355756b godot: remove conditional around legacysupport PG
</span>7f33355756b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7f33355756b7da4bf73024dcb7f88c25cea34107
</span>Author: Jason Liu <jasonliu--@users.noreply.github.com>
AuthorDate: Sun Dec 12 20:31:44 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> godot: remove conditional around legacysupport PG
</span>---
games/godot/Portfile | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 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 2fdf1b219b8..d36a4bb232b 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;'>@@ -23,10 +23,7 @@ long_description Godot Engine is a cross-platform game engine for \
</span> (Android, iOS) and web-based (HTML5) platforms.
if {$subport eq ${name}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.platform} eq "darwin" && ${os.major} <= 15} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup legacysupport 1.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup legacysupport 1.1
</span>
github.setup godotengine ${name} 3.3.4 "" -stable
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,6 +34,13 @@ if {$subport eq ${name}} {
</span> # Godot fails to build for Xcode Clang < 802,
# but builds fine using MacPorts Clang
compiler.blacklist-append {clang < 802}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ legacysupport.newest_darwin_requires_legacy 15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Using macports-libcxx is needed in order to lower the minimum
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # macOS version specified in -mmacosx-version-min. Otherwise the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # compile will fail, complaining that 'shared_time_mutex' was
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # introduced in macOS 10.12.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ legacysupport.use_mp_libcxx yes
</span> }
subport ${name}-3.2 {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -111,14 +115,10 @@ post-patch {
</span> if {$subport eq ${name} && \
${os.platform} eq "darwin" && ${os.major} <= 15} \
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Using macports-libcxx is needed in order to lower the minimum
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # macOS version specified in -mmacosx-version-min. Otherwise the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # compile will fail, complaining that 'shared_time_mutex' was
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # introduced in macOS 10.12.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- legacysupport.use_mp_libcxx yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Tell the build to use macports-libcxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Tell the build to use macports-libcxx. We have to do it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # manually here in the Portfile, because SCons ignores most/all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # of the environment variables set by MacPorts.
</span> reinplace "/LINKFLAGS.*isysroot.*MACOS_SDK_PATH/a\\
\\
\\ env.Append(CXXFLAGS=\[\"-nostdinc++\", \"-I${prefix}/include/libcxx/v1\"\])\\
</pre><pre style='margin:0'>
</pre>