<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/477af2eda93223aa520992f32757f865ea20c49e">https://github.com/macports/macports-ports/commit/477af2eda93223aa520992f32757f865ea20c49e</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 477af2eda93 lang/ruby31: fix missing linker flag "-framework Security" for 10.7 .. 10.9
</span>477af2eda93 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 477af2eda93223aa520992f32757f865ea20c49e
</span>Author: kimura wataru <kimuraw@i.nifty.jp>
AuthorDate: Sun Jun 26 11:05:20 2022 +0900
<span style='display:block; white-space:pre;color:#404040;'> lang/ruby31: fix missing linker flag "-framework Security" for 10.7 .. 10.9
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> refs: https://trac.macports.org/ticket/65290
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> [note] other problem looks remain on 10.8 and 10.9.
</span><span style='display:block; white-space:pre;color:#404040;'> generating ext/-test-/RUBY_ALIGNOF/Makefile overwrites topdir's Makefile.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - fix detecting macOS version in configure and dln.c
</span><span style='display:block; white-space:pre;color:#404040;'> - AvailabirityMacros.h does not contains macros future versions.
</span><span style='display:block; white-space:pre;color:#404040;'> for example, "MAC_OS_X_VERSION_10_10" does not defined in 10.9's headerfile.
</span><span style='display:block; white-space:pre;color:#404040;'> - fix dsymutil error at build phase when using macports-clang-* as configure.compiler.
</span><span style='display:block; white-space:pre;color:#404040;'> but this error might not affect build result.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> ```
</span><span style='display:block; white-space:pre;color:#404040;'> $ sw_vers -productVersion
</span><span style='display:block; white-space:pre;color:#404040;'> 10.9.5
</span><span style='display:block; white-space:pre;color:#404040;'> $ uname -r
</span><span style='display:block; white-space:pre;color:#404040;'> 13.4.0
</span><span style='display:block; white-space:pre;color:#404040;'> $ cat conftest.c
</span><span style='display:block; white-space:pre;color:#404040;'> /* end confdefs.h. */
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> #include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;color:#404040;'> int
</span><span style='display:block; white-space:pre;color:#404040;'> main ()
</span><span style='display:block; white-space:pre;color:#404040;'> {
</span><span style='display:block; white-space:pre;color:#404040;'> static int test_array [1 - 2 * !(MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7 &&
</span><span style='display:block; white-space:pre;color:#404040;'> MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_10)];
</span><span style='display:block; white-space:pre;color:#404040;'> test_array [0] = 0;
</span><span style='display:block; white-space:pre;color:#404040;'> return test_array [0];
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> ;
</span><span style='display:block; white-space:pre;color:#404040;'> return 0;
</span><span style='display:block; white-space:pre;color:#404040;'> }
</span><span style='display:block; white-space:pre;color:#404040;'> $ cc -c conftest.c
</span><span style='display:block; white-space:pre;color:#404040;'> conftest.c:8:50: error: use of undeclared identifier 'MAC_OS_X_VERSION_10_10'
</span><span style='display:block; white-space:pre;color:#404040;'> MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_10)];
</span><span style='display:block; white-space:pre;color:#404040;'> ^
</span><span style='display:block; white-space:pre;color:#404040;'> 1 error generated.
</span><span style='display:block; white-space:pre;color:#404040;'> ```
</span>---
lang/ruby31/Portfile | 12 +++++++++++-
lang/ruby31/files/patch-configure.diff | 13 +++++++++++++
lang/ruby31/files/patch-dln.c.diff | 11 +++++++++++
3 files changed, 35 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby31/Portfile b/lang/ruby31/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 920c31529e8..a2b2c52bccb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby31/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby31/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,7 +14,7 @@ set ruby_patch 2
</span> set ruby_ver_nodot [string map {. {}} ${ruby_ver}]
name ruby${ruby_ver_nodot}
version ${ruby_ver}.${ruby_patch}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
categories lang ruby
maintainers {kimuraw @kimuraw} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,6 +62,11 @@ select.file ${filespath}/ruby${ruby_ver_nodot}
</span> compiler.blacklist-append \
{ clang < 901 }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if { [string match macports-clang-* ${configure.compiler}] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # clang-mp-14 => dsymutil-mp-14; fix POSTLINK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append dsymutil=[string map {clang dsymutil} ${configure.cc}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> compiler.thread_local_storage yes
configure.args --enable-shared \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,6 +88,11 @@ configure.args-append AR=${prefix}/bin/ar RANLIB=${prefix}/bin/ranlib
</span> # https://bugs.ruby-lang.org/issues/18373
patchfiles patch-_bundle_gems-extconf.rb.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# fix version detection with AvailabitiryMacro.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# future version should be a numeric literal, not a macro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-configure.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-dln.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Add the architecture flag as required
if {[info exists build_arch] && ${build_arch} != ""} {
configure.args-append "--with-arch=${build_arch}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby31/files/patch-configure.diff b/lang/ruby31/files/patch-configure.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3faaaf07d94
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby31/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2022-04-12 20:11:17.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2022-06-24 23:16:18.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31718,8 +31718,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static int test_array [1 - 2 * !(MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7 &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_10)];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static int test_array [1 - 2 * !(MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MAC_OS_X_VERSION_MIN_REQUIRED < 101000)];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test_array [0] = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return test_array [0];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby31/files/patch-dln.c.diff b/lang/ruby31/files/patch-dln.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..bda94d9d634
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby31/files/patch-dln.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dln.c.orig 2022-04-12 20:11:15.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dln.c 2022-06-25 23:48:32.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -380,7 +380,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if defined __APPLE__ && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ defined(MAC_OS_X_VERSION_MIN_REQUIRED) && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_11)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (MAC_OS_X_VERSION_MIN_REQUIRED < 101100)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* dlclose() segfaults */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rb_fatal("%s - %s", incompatible, file);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # else
</span></pre><pre style='margin:0'>
</pre>