diff --git a/lang/ruby18-base/distinfo b/lang/ruby18-base/distinfo index 77053b6a1..c4a0d8355 100644 --- a/lang/ruby18-base/distinfo +++ b/lang/ruby18-base/distinfo @@ -54,3 +54,7 @@ SHA1 (patch-lex.c) = 3bdbd6ccaebe3999fedfc16309657ae5da26fd2a SHA1 (patch-lib_rdoc_options.rb) = 0f14417733ad6fc6fbc93af1c8463ecd59abce7c SHA1 (patch-lib_rdoc_rdoc.rb) = bef895245cc06ca84fd1e5d506c3c65932921b3a SHA1 (patch-lib_rexml_entity.rb) = 5038826abfa6a56406fe369dfc74c9fe096665f6 +SHA1 (patch-zz-minix-a) = 60dbf6854e473ded578ef63386c010ec73a771c3 +SHA1 (patch-zz-minix-b) = 3a2fa48b30ee5b0bd09867820cc4c8adad5f3ba1 +SHA1 (patch-zz-minix-c) = d81dfd4586e4c314d913e54204d74a50af40222a +SHA1 (patch-zz-minix-d) = d6ab3d093f2f172efff4aa1a15fca92ed710a5bd diff --git a/lang/ruby18-base/patches/patch-zz-minix-a b/lang/ruby18-base/patches/patch-zz-minix-a new file mode 100644 index 000000000..b7d9b4e82 --- /dev/null +++ b/lang/ruby18-base/patches/patch-zz-minix-a @@ -0,0 +1,29 @@ +--- configure.orig Tue Nov 29 16:02:10 2016 ++++ configure Tue Nov 29 16:03:18 2016 +@@ -10415,7 +10415,7 @@ + *shlicc*) : ${LDSHARED="$CC -r"} + rb_cv_dlopen=yes ;; + esac ;; +- linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi*) ++ linux* | gnu* | k*bsd*-gnu | minix* | netbsd* | bsdi*) + : ${LDSHARED='${CC} -shared'} + if test "$rb_cv_binary_elf" = yes; then + LDFLAGS="$LDFLAGS -Wl,-export-dynamic" +@@ -10910,7 +10910,7 @@ + LIBRUBY_ALIASES='' + fi + ;; +- netbsd*) ++ minix* | netbsd*) + SOLIBS='$(LIBS)' + LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)' + LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)' +@@ -10996,7 +10996,7 @@ + linux*) + XCFLAGS="$XCFLAGS -D_GNU_SOURCE=1" + ;; +- netbsd*) ++ minix* | netbsd*) + CFLAGS="$CFLAGS -pipe" + ;; + nextstep*|openstep*) diff --git a/lang/ruby18-base/patches/patch-zz-minix-b b/lang/ruby18-base/patches/patch-zz-minix-b new file mode 100644 index 000000000..04a2b7b19 --- /dev/null +++ b/lang/ruby18-base/patches/patch-zz-minix-b @@ -0,0 +1,29 @@ +--- ext/curses/curses.c.orig Tue Nov 29 16:04:38 2016 ++++ ext/curses/curses.c Tue Nov 29 16:06:16 2016 +@@ -29,7 +29,7 @@ + # include + #else + # include +-# if defined(__bsdi__) || defined(__NetBSD__) || defined(__APPLE__) ++# if defined(__bsdi__) || defined(__minix) || defined(__NetBSD__) || defined(__APPLE__) + # if !defined(_maxx) + # define _maxx maxx + # endif +@@ -1424,7 +1424,7 @@ + + GetWINDOW(obj,winp); + /* keypad() of NetBSD's libcurses returns no value */ +-#if defined(__NetBSD__) && !defined(NCURSES_VERSION) ++#if (defined(__minix) || defined(__NetBSD__)) && !defined(NCURSES_VERSION) + keypad(winp->window,(RTEST(val) ? TRUE : FALSE)); + return Qnil; + #else +@@ -1445,7 +1445,7 @@ + GetWINDOW(obj,winp); + + /* nodelay() of NetBSD's libcurses returns no value */ +-#if defined(__NetBSD__) && !defined(NCURSES_VERSION) ++#if (defined(__minix) || defined(__NetBSD__)) && !defined(NCURSES_VERSION) + nodelay(winp->window, RTEST(val) ? TRUE : FALSE); + return Qnil; + #else diff --git a/lang/ruby18-base/patches/patch-zz-minix-c b/lang/ruby18-base/patches/patch-zz-minix-c new file mode 100644 index 000000000..461528f54 --- /dev/null +++ b/lang/ruby18-base/patches/patch-zz-minix-c @@ -0,0 +1,20 @@ +--- io.c.orig Tue Nov 29 16:08:20 2016 ++++ io.c Tue Nov 29 16:09:40 2016 +@@ -38,7 +38,7 @@ + #endif + + #ifndef BSD_STDIO +-# if defined(__MACH__) || defined(__DARWIN__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) ++# if defined(__MACH__) || defined(__DARWIN__) || defined(__FreeBSD__) || defined(__minix) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) + # define BSD_STDIO 1 + # else + # define BSD_STDIO 0 +@@ -1308,7 +1308,7 @@ + } + if (fptr->f) { /* update pos in FILE structure [ruby-core:21561] */ + fflush(fptr->f); +-#if defined(__SOFF) && defined(__NetBSD__) ++#if defined(__SOFF) && (defined(__minix) || defined(__NetBSD__)) + fptr->f->_flags &= ~__SOFF; + (void)io_tell(fptr); + #endif diff --git a/lang/ruby18-base/patches/patch-zz-minix-d b/lang/ruby18-base/patches/patch-zz-minix-d new file mode 100644 index 000000000..3e7c394f8 --- /dev/null +++ b/lang/ruby18-base/patches/patch-zz-minix-d @@ -0,0 +1,17 @@ +--- process.c.orig Tue Nov 29 16:11:43 2016 ++++ process.c Tue Nov 29 16:13:03 2016 +@@ -86,12 +86,12 @@ + #define __MacOS_X__ 1 + #endif + +-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) ++#if defined(__FreeBSD__) || defined(__minix) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) + #define HAVE_44BSD_SETUID 1 + #define HAVE_44BSD_SETGID 1 + #endif + +-#ifdef __NetBSD__ ++#if defined(__minix) || defined(__NetBSD__) + #undef HAVE_SETRUID + #undef HAVE_SETRGID + #endif