<pre style='margin:0'>
kimura wataru (kimuraw) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/12aec60fe1cd54e3bd6f9c10b2eaab79f89bd9c4">https://github.com/macports/macports-ports/commit/12aec60fe1cd54e3bd6f9c10b2eaab79f89bd9c4</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 12aec60fe1c lang/ruby: apply sdkroot hack on macOS 11
</span>12aec60fe1c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 12aec60fe1cd54e3bd6f9c10b2eaab79f89bd9c4
</span>Author: kimura wataru <kimuraw@macports.org>
AuthorDate: Sat Jan 2 12:02:44 2021 +0900
<span style='display:block; white-space:pre;color:#404040;'> lang/ruby: apply sdkroot hack on macOS 11
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> rewrite sdkroot in rbconfig.rb to MacOSX.sdk from MacOS11.x.sdk
</span><span style='display:block; white-space:pre;color:#404040;'> (ruby-1.8 does not contain .pc for pkg-config)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> https://trac.macports.org/ticket/61899
</span>---
lang/ruby/Portfile | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby/Portfile b/lang/ruby/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a823b735f37..5f213547fdb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,7 @@ deprecated.upstream_support no
</span>
name ruby
version 1.8.7-p374
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 12
</span>
categories lang ruby
maintainers {kimuraw @kimuraw}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -116,6 +116,20 @@ configure.args --enable-shared \
</span> # ignore minor version for archdir, like i686-darwin9
configure.env UNAME_RELEASE=${os.major}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# [NOTE] workaround for mismatch of sdk versions on macOS 11.x,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# such as MacOSX11.0.sdk (buildbot) <=> MacOSX11.1.sdk (user's Mac).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (see ruby27)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} >= 20} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # rewrite MacOSX11.1.sdk -> MacOSX.sdk in rbconfig.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${worksrcpath}/rbconfig.rb ${worksrcpath}/rbconfig.rb.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E -q {s|(/MacOSX)[0-9\.]+(\.sdk[\'\"]?[[:blank:]])|\1\2|g} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/rbconfig.rb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E -q {s|(/MacOSX)[0-9\.]+(\.sdk[\'\"]?)$|\1\2|g} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/rbconfig.rb
</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> if {[variant_isset universal]} {
# NOTE: directory layout of port:ruby +universal
# universal binary
</pre><pre style='margin:0'>
</pre>