<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/29939ce9640ad5f4ca0d34922f6f48d73eaeb7d2">https://github.com/macports/macports-ports/commit/29939ce9640ad5f4ca0d34922f6f48d73eaeb7d2</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 29939ce9640 ruby: fix implicit function declarations (#9585)
</span>29939ce9640 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 29939ce9640ad5f4ca0d34922f6f48d73eaeb7d2
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Jan 2 12:57:02 2021 +1100
<span style='display:block; white-space:pre;color:#404040;'> ruby: fix implicit function declarations (#9585)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/61255
</span>---
lang/ruby/Portfile | 19 ++---------
lang/ruby/files/implicit.patch | 75 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 77 insertions(+), 17 deletions(-)
<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 4cdb6519c2b..a823b735f37 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;'>@@ -76,7 +76,8 @@ patchfiles patch-vendordir.diff \
</span> patch-ext-tk-extconf.rb.diff \
patch-ext_openssl_extconf_rb.diff \
patch-ext_openssl_ossl_ssl_c.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-ext_openssl_ossl.h.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-ext_openssl_ossl.h.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ implicit.patch
</span>
# ignore getcontext() and setcontext()
# on 10.5 or later, these functions have some problems (SEGV on ppc, slower than 1.8.6)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -170,22 +171,6 @@ post-destroot {
</span> platform darwin {
# for proper rdoc/ri creation, make sure to link to destroot libruby.dylib
destroot.env DYLD_LIBRARY_PATH=${destroot}${prefix}/lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ruby-1.8 cannot build with Xcode 12 (#61255)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # macOS 11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} >= 20} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${name} does not support macOS 11 or later."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "incompatible macOS version"
</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:#ffe0e0;'>- # macOS 10.15
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} == 19 || [vercmp ${xcodeversion} 12.0] >= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${name} does not support Xcode 12 or later."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "incompatible Xcode version"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
variant tk conflicts mactk description "enable tk support" {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby/files/implicit.patch b/lang/ruby/files/implicit.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..09d749855c3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby/files/implicit.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,75 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2021-01-01 19:59:14.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2021-01-01 20:11:01.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9104,6 +9104,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <time.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if HAVE_STDLIB_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ check(tm, y, m, d, h, s)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9911,6 +9914,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if HAVE_STRING_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if HAVE_UNISTD_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef SEEK_SET
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define SEEK_SET 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10297,6 +10306,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Test for whether ELF binaries are produced */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <fcntl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if HAVE_UNISTD_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char buffer[4];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i=open("conftest",O_RDONLY);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- eval.c.orig 2012-06-29 22:31:25.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ eval.c 2021-01-01 20:18:06.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7264,6 +7264,8 @@ rb_provide(feature)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rb_provide_feature(rb_str_new2(feature));
</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;'>++int rb_thread_join _((VALUE, double));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static char *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ load_lock(ftptr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char *ftptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11524,7 +11526,6 @@ rb_thread_select(max, read, write, excep
</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;'>+ static int rb_thread_join0 _((rb_thread_t, double));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int rb_thread_join _((VALUE, double));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rb_thread_join0(th, limit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- main.c.orig 2021-01-01 20:24:49.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ main.c 2021-01-01 20:25:10.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,6 +26,7 @@ int _CRT_glob = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* to link startup code with ObjC support */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if (defined(__APPLE__) || defined(__NeXT__)) && defined(__MACH__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <objc/message.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void objcdummyfunction( void ) { objc_msgSend(); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/pty/pty.c.orig 2008-04-15 13:35:55.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/pty/pty.c 2021-01-01 20:42:05.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,6 +21,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define WIFSTOPPED(status) (((status) & 0xff) == 0x7f)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <ctype.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int openpty(int *, int *, char *, struct termios *,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct winsize *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "ruby.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "rubyio.h"
</span></pre><pre style='margin:0'>
</pre>