<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/20e9f727c705381eb6694717f1cc14ad9945eaa3">https://github.com/macports/macports-ports/commit/20e9f727c705381eb6694717f1cc14ad9945eaa3</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 20e9f727c705381eb6694717f1cc14ad9945eaa3
</span>Author: kimura wataru <kimuraw@macports.org>
AuthorDate: Wed Dec 30 06:46:03 2020 +0900
<span style='display:block; white-space:pre;color:#404040;'> lang/ruby30, ruby27, ruby26: fix target OS versions of sdkroot hack
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> target OS versions: darwin 20 (macOS 11) *or later*
</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 and ruby-*.pc to MacOSX.sdk from MacOS11.x.sdk.
</span><span style='display:block; white-space:pre;color:#404040;'> see https://trac.macports.org/ticket/61899
</span>---
lang/ruby26/Portfile | 6 +++---
lang/ruby27/Portfile | 6 +++---
lang/ruby30/Portfile | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby26/Portfile b/lang/ruby26/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 10a826c7266..b328f757bc9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby26/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby26/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,16 +60,16 @@ configure.args --enable-shared \
</span> # such as MacOSX11.0.sdk (buildbot) <=> MacOSX11.1.sdk (user's Mac).
# (see ruby27)
post-build {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} == 20} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} >= 20} {
</span> # ruby saves its' compile options (CFLAGS, LDFLAGS, ..) in "rbconfig.rb" at build,
# and uses the options when complile binary extensions.
# rewrite MacOSX11.1.sdk -> MacOSX.sdk in rbconfig.rb
file copy ${worksrcpath}/rbconfig.rb ${worksrcpath}/rbconfig.rb.orig
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E {s|(/MacOSX)[0-9\.]+(\.sdk[\'\"]?[[:blank:]])|\1\2|g} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E -q {s|(/MacOSX)[0-9\.]+(\.sdk[\'\"]?[[:blank:]])|\1\2|g} \
</span> ${worksrcpath}/rbconfig.rb \
${worksrcpath}/ruby-2.6.pc
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E {s|(/MacOSX)[0-9\.]+(\.sdk[\'\"]?)$|\1\2|g} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E -q {s|(/MacOSX)[0-9\.]+(\.sdk[\'\"]?)$|\1\2|g} \
</span> ${worksrcpath}/rbconfig.rb \
${worksrcpath}/ruby-2.6.pc
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby27/Portfile b/lang/ruby27/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 33bb23d6812..cc90b8d16e8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby27/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby27/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,16 +65,16 @@ configure.args --enable-shared \
</span> # - rb27-nokogiri @1.10.4 : Failed to compile on Big Sur (Apple Silicon)
# https://trac.macports.org/ticket/61827
post-build {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} == 20} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} >= 20} {
</span> # ruby saves its' compile options (CFLAGS, LDFLAGS, ..) in "rbconfig.rb" at build,
# and uses the options when complile binary extensions.
# rewrite MacOSX11.1.sdk -> MacOSX.sdk in rbconfig.rb
file copy ${worksrcpath}/rbconfig.rb ${worksrcpath}/rbconfig.rb.orig
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E {s|(/MacOSX)[0-9\.]+(\.sdk[\'\"]?[[:blank:]])|\1\2|g} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E -q {s|(/MacOSX)[0-9\.]+(\.sdk[\'\"]?[[:blank:]])|\1\2|g} \
</span> ${worksrcpath}/rbconfig.rb \
${worksrcpath}/ruby-2.7.pc
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E {s|(/MacOSX)[0-9\.]+(\.sdk[\'\"]?)$|\1\2|g} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E -q {s|(/MacOSX)[0-9\.]+(\.sdk[\'\"]?)$|\1\2|g} \
</span> ${worksrcpath}/rbconfig.rb \
${worksrcpath}/ruby-2.7.pc
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby30/Portfile b/lang/ruby30/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bd28eb43e55..7bb454b9ace 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby30/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby30/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,7 +62,7 @@ configure.args --enable-shared \
</span> #
# see ruby27/Portfile
post-build {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} == 20} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} >= 20} {
</span> # ruby saves its' compile options (CFLAGS, LDFLAGS, ..) in "rbconfig.rb" at build,
# and uses the options when complile binary extensions.
</pre><pre style='margin:0'>
</pre>