omnibus-software 22.11.239

data/config/patches/ruby/patch-configure

@@ -0,0 +1,103 @@
+$NetBSD: patch-configure,v 1.4 2012/10/12 14:51:31 taca Exp $
+
+* Adding Interix and MirBSD support.
+* Ignore doxygen.
+
+--- configure.orig	2012-10-12 09:23:46.000000000 +0000
++++ configure
+@@ -10654,6 +10654,9 @@ esac
+   superux*) :
+     	ac_cv_func_setitimer=no
+ 		 ;; #(
++  interix*)	LIBS="-lm $LIBS"
++	ac_cv_func_getpgrp_void=yes
++		 ;; #(
+   *) :
+     	LIBS="-lm $LIBS" ;;
+ esac
+@@ -11980,6 +11983,9 @@ fi
+ ac_fn_c_check_type "$LINENO" "struct timespec" "ac_cv_type_struct_timespec" "#ifdef HAVE_TIME_H
+ #include <time.h>
+ #endif
++#ifdef HAVE_SYS_TIME_H
++# include <sys/time.h>
++#endif
+ "
+ if test "x$ac_cv_type_struct_timespec" = xyes; then :
+ 
+@@ -15790,7 +15796,7 @@ done
+     MAINLIBS="-pthread $MAINLIBS" ;; #(
+   *) :
+     case "$target_os" in #(
+-  openbsd*) :
++  openbsd*|mirbsd*) :
+     LIBS="-pthread $LIBS" ;; #(
+   *) :
+     LIBS="-l$pthread_lib $LIBS" ;;
+@@ -16239,8 +16245,12 @@ esac ;; #(
+ 			rb_cv_dlopen=yes ;; #(
+   interix*) :
+     	: ${LDSHARED='$(CC) -shared'}
++			LDFLAGS="$LDFLAGS -Wl,-E"
+ 			XLDFLAGS="$XLDFLAGS -Wl,-E"
++			# use special random-slot linkage in 0x[56]XXXXXXX
+ 			LIBPATHFLAG=" -L%1\$-s"
++			DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))'
++			RPATHFLAG=' -Wl,-R%1$-s'
+ 			rb_cv_dlopen=yes ;; #(
+   freebsd*|dragonfly*) :
+ 
+@@ -16252,7 +16262,7 @@ esac ;; #(
+ 			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable"
+ 			fi
+ 			rb_cv_dlopen=yes ;; #(
+-  openbsd*) :
++  openbsd*|mirbsd*) :
+     	: ${LDSHARED='$(CC) -shared ${CCDLFLAGS}'}
+ 			if test "$rb_cv_binary_elf" = yes; then
+ 			    LDFLAGS="$LDFLAGS -Wl,-E"
+@@ -16781,7 +16791,7 @@ _ACEOF
+   freebsd*|dragonfly*) :
+ 
+ 	SOLIBS='$(LIBS)'
+-	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'
++	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)$(TEENY)'
+ 	if test "$rb_cv_binary_elf" != "yes" ; then
+ 	    LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
+ 	    LIBRUBY_ALIASES=''
+@@ -16798,7 +16808,7 @@ _ACEOF
+ 	   LIBRUBY_ALIASES=""
+ 	fi
+ 	 ;; #(
+-  openbsd*) :
++  openbsd*|mirbsd*) :
+ 
+ 	SOLIBS='$(LIBS)'
+ 	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
+@@ -16859,7 +16869,12 @@ esac
+ 	 ;; #(
+   interix*) :
+ 
+-	LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
++	SOLIBS='$(LIBS)'
++	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
++	# link explicitly to 0x48000000
++	LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552'
++	LIBRUBYARG_SHARED='-Wl,-R -Wl,${libdir} -L${libdir} -L. -l$(RUBY_SO_NAME)'
++	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so'
+ 	 ;; #(
+   *) :
+      ;;
+@@ -16922,11 +16937,7 @@ if test "$install_doc" != no; then
+     else
+ 	RDOCTARGET="nodoc"
+     fi
+-    if test "$install_capi" != no -a -n "$DOXYGEN"; then
+-	CAPITARGET="capi"
+-    else
+-	CAPITARGET="nodoc"
+-    fi
++    CAPITARGET="nodoc"
+ else
+     RDOCTARGET="nodoc"
+     CAPITARGET="nodoc"

data/config/patches/ruby/remove_nano.patch

@@ -0,0 +1,10 @@
+--- ruby-2.7.2-orig/ext/win32ole/win32ole.c	2020-10-01 05:15:38.000000000 -0700
++++ ruby-2.7.2/ext/win32ole/win32ole.c	2021-03-24 07:59:55.000000000 -0700
+@@ -3969,7 +3969,6 @@
+ {
+     cWIN32OLE_lcid = LOCALE_SYSTEM_DEFAULT;
+     g_ole_initialized_init();
+-    check_nano_server();
+ 
+     com_vtbl.QueryInterface = QueryInterface;
+     com_vtbl.AddRef = AddRef;

data/config/patches/ruby/ruby-2.6.7_c99.patch

@@ -0,0 +1,12 @@
+--- ruby-2.6.7-orig/hash.c	2021-04-05 04:48:34.000000000 -0700
++++ ruby-2.6.7/hash.c	2021-04-16 13:50:06.000000000 -0700
+@@ -5658,7 +5658,8 @@
+     long keylen, elen;
+     const char *keyptr, *eptr;
+     RSTRING_GETMEM(key, keyptr, keylen);
+-    for (long i=0; i<RARRAY_LEN(keys); i++) {
++    long i;
++    for (i=0; i<RARRAY_LEN(keys); i++) {
+         VALUE e = RARRAY_AREF(keys, i);
+         RSTRING_GETMEM(e, eptr, elen);
+         if (elen != keylen) continue;

data/config/patches/ruby/ruby-3.0.1-configure.patch

@@ -0,0 +1,281 @@
+diff -ur ruby-3.0.1/configure.ac ruby-3.0.1-patched/configure.ac
+--- ruby-3.0.1/configure.ac	2021-04-05 05:33:42.000000000 -0700
++++ ruby-3.0.1-patched/configure.ac	2021-04-09 12:42:35.578174106 -0700
+@@ -544,11 +544,16 @@
+     rpathflag=`echo "$RPATHFLAG" | sed 's/%.*//'`
+ ])
+ 
+-RUBY_TRY_CFLAGS(-fdeclspec, [
+-  RUBY_APPEND_OPTIONS(CC, -fdeclspec)
+-  RUBY_APPEND_OPTIONS(MJIT_CC, -fdeclspec)
++RUBY_TRY_LDFLAGS(-fdeclspec, [fdeclspec=yes], [fdeclspec=no])
++AS_IF([test "$fdeclspec" = yes], [
++    RUBY_APPEND_OPTIONS(CFLAGS, -fdeclspec)
++    RUBY_APPEND_OPTIONS(cflags, -fdeclspec)
++    RUBY_APPEND_OPTIONS(orig_cflags, -fdeclspec)
++])
++RUBY_TRY_CXXFLAGS(-fdeclspec, [fdeclspec=yes], [fdeclspec=no])
++AS_IF([test "$fdeclspec" = yes], [
++    RUBY_APPEND_OPTIONS(CXXFLAGS, -fdeclspec)
+ ])
+-RUBY_TRY_CXXFLAGS(-fdeclspec, [RUBY_APPEND_OPTIONS(CXX, -fdeclspec)])
+ 
+ AS_CASE([$RUBY_PATCHLEVEL], [-*],
+ 	[RUBY_DEVEL=yes], [RUBY_DEVEL=no])
+@@ -1494,7 +1499,9 @@
+ 	AC_DEFINE_UNQUOTED([RUBY_ALIAS_FUNCTION_VOID(prot, name, args)],
+ 			   [RUBY_ALIAS_FUNCTION_TYPE(void, prot, name, args)])
+     ])
++])
+ 
++{
+     AC_CACHE_CHECK([for __atomic builtins], [rb_cv_gcc_atomic_builtins], [
+ 	AC_TRY_LINK([unsigned int atomic_var;],
+ 		    [
+@@ -1525,7 +1532,6 @@
+     AS_IF([test "$rb_cv_gcc_sync_builtins" = yes], [
+ 	AC_DEFINE(HAVE_GCC_SYNC_BUILTINS)
+     ])
+-])
+ 
+     AC_CACHE_CHECK(for __builtin_unreachable, rb_cv_func___builtin_unreachable,
+     [RUBY_WERROR_FLAG(
+@@ -1538,6 +1544,7 @@
+     AS_IF([test "$rb_cv_func___builtin_unreachable" = yes], [
+ 	AC_DEFINE_UNQUOTED(UNREACHABLE, [__builtin_unreachable()])
+     ])
++}
+ 
+ AC_CACHE_CHECK(for exported function attribute, rb_cv_func_exported, [
+ rb_cv_func_exported=no
+diff -ur ruby-3.0.1/internal/bits.h ruby-3.0.1-patched/internal/bits.h
+--- ruby-3.0.1/internal/bits.h	2021-04-05 05:33:42.000000000 -0700
++++ ruby-3.0.1-patched/internal/bits.h	2021-04-09 12:42:35.578845209 -0700
+@@ -284,7 +284,7 @@
+     }
+     else {
+         /* :FIXME: Is there a way to make this branch a compile-time error? */
+-        __builtin_unreachable();
++        UNREACHABLE_RETURN(~0);
+     }
+ 
+ #else
+@@ -419,7 +419,7 @@
+     }
+     else {
+         /* :FIXME: Is there a way to make this branch a compile-time error? */
+-        __builtin_unreachable();
++        UNREACHABLE_RETURN(~0);
+     }
+ 
+ #else
+@@ -492,7 +492,7 @@
+     }
+     else {
+         /* :FIXME: Is there a way to make this branch a compile-time error? */
+-        __builtin_unreachable();
++        UNREACHABLE_RETURN(~0);
+     }
+ 
+ #else
+diff -ur ruby-3.0.1/template/Makefile.in ruby-3.0.1-patched/template/Makefile.in
+--- ruby-3.0.1/template/Makefile.in	2021-04-05 05:33:42.000000000 -0700
++++ ruby-3.0.1-patched/template/Makefile.in	2021-04-09 12:42:35.579834751 -0700
+@@ -75,7 +75,7 @@
+ CC_VERSION = @CC_VERSION@
+ OUTFLAG = @OUTFLAG@$(empty)
+ COUTFLAG = @COUTFLAG@$(empty)
+-CPPOUTFLAG = $(COUTFLAG)
++CPPOUTFLAG = >
+ ARCH_FLAG = @ARCH_FLAG@
+ CFLAGS_NO_ARCH = @CFLAGS@
+ CFLAGS = $(CFLAGS_NO_ARCH) $(ARCH_FLAG)
+diff -ur ruby-3.0.1/configure ruby-3.0.1-patched/configure
+--- ruby-3.0.1/configure	2021-04-05 05:33:44.000000000 -0700
++++ ruby-3.0.1-patched/configure	2021-04-09 13:21:37.087380251 -0700
+@@ -9345,8 +9345,10 @@
+ fi
+ 
+ 
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -fdeclspec is accepted as CFLAGS" >&5
+-$as_echo_n "checking whether -fdeclspec is accepted as CFLAGS... " >&6; }
++    save_LDFLAGS="$LDFLAGS"
++    LDFLAGS="$LDFLAGS -fdeclspec"
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -fdeclspec is accepted as LDFLAGS" >&5
++$as_echo_n "checking whether -fdeclspec is accepted as LDFLAGS... " >&6; }
+     save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $rb_cv_warnflags"
+ if test "${ac_c_werror_flag+set}"; then :
+@@ -9360,7 +9362,6 @@
+ fi
+ ac_c_werror_flag=yes
+ 
+-    CFLAGS="$CFLAGS -fdeclspec"
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -9372,39 +9373,17 @@
+   return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-
+-  # RUBY_APPEND_OPTIONS(CC)
+-	for rb_opt in -fdeclspec; do
+-	case " ${CC-} " in #(
+-  *" ${rb_opt} "*) :
+-     ;; #(
+-  '  ') :
+-     CC="${rb_opt}" ;; #(
+-  *) :
+-     CC="$CC ${rb_opt}" ;;
+-esac
+-	done
+-  # RUBY_APPEND_OPTIONS(MJIT_CC)
+-	for rb_opt in -fdeclspec; do
+-	case " ${MJIT_CC-} " in #(
+-  *" ${rb_opt} "*) :
+-     ;; #(
+-  '  ') :
+-     MJIT_CC="${rb_opt}" ;; #(
+-  *) :
+-     MJIT_CC="$MJIT_CC ${rb_opt}" ;;
+-esac
+-	done
+-
++if ac_fn_c_try_link "$LINENO"; then :
++  fdeclspec=yes
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+     $as_echo "${msg_result_yes}yes${msg_reset}" >&6 ; }
+ else
+-
++  fdeclspec=no
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     $as_echo "${msg_result_no}no${msg_reset}" >&6 ; }
+ fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ 
+ CFLAGS="$save_CFLAGS"
+ save_CFLAGS=
+@@ -9417,7 +9396,46 @@
+   unset ac_c_werror_flag
+ 
+ fi
++    LDFLAGS="$save_LDFLAGS"
++    save_LDFLAGS=
+ 
++if test "$fdeclspec" = yes; then :
++
++    # RUBY_APPEND_OPTIONS(CFLAGS)
++	for rb_opt in -fdeclspec; do
++	case " ${CFLAGS-} " in #(
++  *" ${rb_opt} "*) :
++     ;; #(
++  '  ') :
++     CFLAGS="${rb_opt}" ;; #(
++  *) :
++     CFLAGS="$CFLAGS ${rb_opt}" ;;
++esac
++	done
++    # RUBY_APPEND_OPTIONS(cflags)
++	for rb_opt in -fdeclspec; do
++	case " ${cflags-} " in #(
++  *" ${rb_opt} "*) :
++     ;; #(
++  '  ') :
++     cflags="${rb_opt}" ;; #(
++  *) :
++     cflags="$cflags ${rb_opt}" ;;
++esac
++	done
++    # RUBY_APPEND_OPTIONS(orig_cflags)
++	for rb_opt in -fdeclspec; do
++	case " ${orig_cflags-} " in #(
++  *" ${rb_opt} "*) :
++     ;; #(
++  '  ') :
++     orig_cflags="${rb_opt}" ;; #(
++  *) :
++     orig_cflags="$orig_cflags ${rb_opt}" ;;
++esac
++	done
++
++fi
+ 
+ 
+     save_CXXFLAGS="$CXXFLAGS"
+@@ -9455,21 +9473,11 @@
+ }
+ _ACEOF
+ if ac_fn_cxx_try_link "$LINENO"; then :
+-  # RUBY_APPEND_OPTIONS(CXX)
+-	for rb_opt in -fdeclspec; do
+-	case " ${CXX-} " in #(
+-  *" ${rb_opt} "*) :
+-     ;; #(
+-  '  ') :
+-     CXX="${rb_opt}" ;; #(
+-  *) :
+-     CXX="$CXX ${rb_opt}" ;;
+-esac
+-	done
++  fdeclspec=yes
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+     $as_echo "${msg_result_yes}yes${msg_reset}" >&6 ; }
+ else
+-
++  fdeclspec=no
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     $as_echo "${msg_result_no}no${msg_reset}" >&6 ; }
+ fi
+@@ -9496,6 +9504,21 @@
+     CXXFLAGS="$save_CXXFLAGS"
+     save_CXXFLAGS=
+ 
++if test "$fdeclspec" = yes; then :
++
++    # RUBY_APPEND_OPTIONS(CXXFLAGS)
++	for rb_opt in -fdeclspec; do
++	case " ${CXXFLAGS-} " in #(
++  *" ${rb_opt} "*) :
++     ;; #(
++  '  ') :
++     CXXFLAGS="${rb_opt}" ;; #(
++  *) :
++     CXXFLAGS="$CXXFLAGS ${rb_opt}" ;;
++esac
++	done
++
++fi
+ 
+ case $RUBY_PATCHLEVEL in #(
+   -*) :
+@@ -19369,6 +19392,9 @@
+ 
+ fi
+ 
++fi
++
++{
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __atomic builtins" >&5
+ $as_echo_n "checking for __atomic builtins... " >&6; }
+ if ${rb_cv_gcc_atomic_builtins+:} false; then :
+@@ -19450,8 +19476,6 @@
+ 
+ fi
+ 
+-fi
+-
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_unreachable" >&5
+ $as_echo_n "checking for __builtin_unreachable... " >&6; }
+ if ${rb_cv_func___builtin_unreachable+:} false; then :
+@@ -19511,6 +19535,7 @@
+ 
+ 
+ fi
++}
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for exported function attribute" >&5
+ $as_echo_n "checking for exported function attribute... " >&6; }

data/config/patches/ruby/ruby-3.0.2-configure.patch

@@ -0,0 +1,251 @@
+diff -ur ruby-3.0.1/configure.ac ruby-3.0.1-patched/configure.ac
+--- ruby-3.0.1/configure.ac	2021-04-05 05:33:42.000000000 -0700
++++ ruby-3.0.1-patched/configure.ac	2021-04-09 12:42:35.578174106 -0700
+@@ -544,11 +544,16 @@
+     rpathflag=`echo "$RPATHFLAG" | sed 's/%.*//'`
+ ])
+ 
+-RUBY_TRY_CFLAGS(-fdeclspec, [
+-  RUBY_APPEND_OPTIONS(CC, -fdeclspec)
+-  RUBY_APPEND_OPTIONS(MJIT_CC, -fdeclspec)
++RUBY_TRY_LDFLAGS(-fdeclspec, [fdeclspec=yes], [fdeclspec=no])
++AS_IF([test "$fdeclspec" = yes], [
++    RUBY_APPEND_OPTIONS(CFLAGS, -fdeclspec)
++    RUBY_APPEND_OPTIONS(cflags, -fdeclspec)
++    RUBY_APPEND_OPTIONS(orig_cflags, -fdeclspec)
++])
++RUBY_TRY_CXXFLAGS(-fdeclspec, [fdeclspec=yes], [fdeclspec=no])
++AS_IF([test "$fdeclspec" = yes], [
++    RUBY_APPEND_OPTIONS(CXXFLAGS, -fdeclspec)
+ ])
+-RUBY_TRY_CXXFLAGS(-fdeclspec, [RUBY_APPEND_OPTIONS(CXX, -fdeclspec)])
+ 
+ AS_CASE([$RUBY_PATCHLEVEL], [-*],
+ 	[RUBY_DEVEL=yes], [RUBY_DEVEL=no])
+@@ -1494,7 +1499,9 @@
+ 	AC_DEFINE_UNQUOTED([RUBY_ALIAS_FUNCTION_VOID(prot, name, args)],
+ 			   [RUBY_ALIAS_FUNCTION_TYPE(void, prot, name, args)])
+     ])
++])
+ 
++{
+     AC_CACHE_CHECK([for __atomic builtins], [rb_cv_gcc_atomic_builtins], [
+ 	AC_TRY_LINK([unsigned int atomic_var;],
+ 		    [
+@@ -1525,7 +1532,6 @@
+     AS_IF([test "$rb_cv_gcc_sync_builtins" = yes], [
+ 	AC_DEFINE(HAVE_GCC_SYNC_BUILTINS)
+     ])
+-])
+ 
+     AC_CACHE_CHECK(for __builtin_unreachable, rb_cv_func___builtin_unreachable,
+     [RUBY_WERROR_FLAG(
+@@ -1538,6 +1544,7 @@
+     AS_IF([test "$rb_cv_func___builtin_unreachable" = yes], [
+ 	AC_DEFINE_UNQUOTED(UNREACHABLE, [__builtin_unreachable()])
+     ])
++}
+ 
+ AC_CACHE_CHECK(for exported function attribute, rb_cv_func_exported, [
+ rb_cv_func_exported=no
+diff -ur ruby-3.0.1/template/Makefile.in ruby-3.0.1-patched/template/Makefile.in
+--- ruby-3.0.1/template/Makefile.in	2021-04-05 05:33:42.000000000 -0700
++++ ruby-3.0.1-patched/template/Makefile.in	2021-04-09 12:42:35.579834751 -0700
+@@ -75,7 +75,7 @@
+ CC_VERSION = @CC_VERSION@
+ OUTFLAG = @OUTFLAG@$(empty)
+ COUTFLAG = @COUTFLAG@$(empty)
+-CPPOUTFLAG = $(COUTFLAG)
++CPPOUTFLAG = >
+ ARCH_FLAG = @ARCH_FLAG@
+ CFLAGS_NO_ARCH = @CFLAGS@
+ CFLAGS = $(CFLAGS_NO_ARCH) $(ARCH_FLAG)
+diff -ur ruby-3.0.1/configure ruby-3.0.1-patched/configure
+--- ruby-3.0.1/configure	2021-04-05 05:33:44.000000000 -0700
++++ ruby-3.0.1-patched/configure	2021-04-09 13:21:37.087380251 -0700
+@@ -9345,8 +9345,10 @@
+ fi
+ 
+ 
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -fdeclspec is accepted as CFLAGS" >&5
+-$as_echo_n "checking whether -fdeclspec is accepted as CFLAGS... " >&6; }
++    save_LDFLAGS="$LDFLAGS"
++    LDFLAGS="$LDFLAGS -fdeclspec"
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -fdeclspec is accepted as LDFLAGS" >&5
++$as_echo_n "checking whether -fdeclspec is accepted as LDFLAGS... " >&6; }
+     save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $rb_cv_warnflags"
+ if test "${ac_c_werror_flag+set}"; then :
+@@ -9360,7 +9362,6 @@
+ fi
+ ac_c_werror_flag=yes
+ 
+-    CFLAGS="$CFLAGS -fdeclspec"
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -9372,39 +9373,17 @@
+   return 0;
+ }
+ _ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-
+-  # RUBY_APPEND_OPTIONS(CC)
+-	for rb_opt in -fdeclspec; do
+-	case " ${CC-} " in #(
+-  *" ${rb_opt} "*) :
+-     ;; #(
+-  '  ') :
+-     CC="${rb_opt}" ;; #(
+-  *) :
+-     CC="$CC ${rb_opt}" ;;
+-esac
+-	done
+-  # RUBY_APPEND_OPTIONS(MJIT_CC)
+-	for rb_opt in -fdeclspec; do
+-	case " ${MJIT_CC-} " in #(
+-  *" ${rb_opt} "*) :
+-     ;; #(
+-  '  ') :
+-     MJIT_CC="${rb_opt}" ;; #(
+-  *) :
+-     MJIT_CC="$MJIT_CC ${rb_opt}" ;;
+-esac
+-	done
+-
++if ac_fn_c_try_link "$LINENO"; then :
++  fdeclspec=yes
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+     $as_echo "${msg_result_yes}yes${msg_reset}" >&6 ; }
+ else
+-
++  fdeclspec=no
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     $as_echo "${msg_result_no}no${msg_reset}" >&6 ; }
+ fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ 
+ CFLAGS="$save_CFLAGS"
+ save_CFLAGS=
+@@ -9417,7 +9396,46 @@
+   unset ac_c_werror_flag
+ 
+ fi
++    LDFLAGS="$save_LDFLAGS"
++    save_LDFLAGS=
+ 
++if test "$fdeclspec" = yes; then :
++
++    # RUBY_APPEND_OPTIONS(CFLAGS)
++	for rb_opt in -fdeclspec; do
++	case " ${CFLAGS-} " in #(
++  *" ${rb_opt} "*) :
++     ;; #(
++  '  ') :
++     CFLAGS="${rb_opt}" ;; #(
++  *) :
++     CFLAGS="$CFLAGS ${rb_opt}" ;;
++esac
++	done
++    # RUBY_APPEND_OPTIONS(cflags)
++	for rb_opt in -fdeclspec; do
++	case " ${cflags-} " in #(
++  *" ${rb_opt} "*) :
++     ;; #(
++  '  ') :
++     cflags="${rb_opt}" ;; #(
++  *) :
++     cflags="$cflags ${rb_opt}" ;;
++esac
++	done
++    # RUBY_APPEND_OPTIONS(orig_cflags)
++	for rb_opt in -fdeclspec; do
++	case " ${orig_cflags-} " in #(
++  *" ${rb_opt} "*) :
++     ;; #(
++  '  ') :
++     orig_cflags="${rb_opt}" ;; #(
++  *) :
++     orig_cflags="$orig_cflags ${rb_opt}" ;;
++esac
++	done
++
++fi
+ 
+ 
+     save_CXXFLAGS="$CXXFLAGS"
+@@ -9455,21 +9473,11 @@
+ }
+ _ACEOF
+ if ac_fn_cxx_try_link "$LINENO"; then :
+-  # RUBY_APPEND_OPTIONS(CXX)
+-	for rb_opt in -fdeclspec; do
+-	case " ${CXX-} " in #(
+-  *" ${rb_opt} "*) :
+-     ;; #(
+-  '  ') :
+-     CXX="${rb_opt}" ;; #(
+-  *) :
+-     CXX="$CXX ${rb_opt}" ;;
+-esac
+-	done
++  fdeclspec=yes
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+     $as_echo "${msg_result_yes}yes${msg_reset}" >&6 ; }
+ else
+-
++  fdeclspec=no
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     $as_echo "${msg_result_no}no${msg_reset}" >&6 ; }
+ fi
+@@ -9496,6 +9504,21 @@
+     CXXFLAGS="$save_CXXFLAGS"
+     save_CXXFLAGS=
+ 
++if test "$fdeclspec" = yes; then :
++
++    # RUBY_APPEND_OPTIONS(CXXFLAGS)
++	for rb_opt in -fdeclspec; do
++	case " ${CXXFLAGS-} " in #(
++  *" ${rb_opt} "*) :
++     ;; #(
++  '  ') :
++     CXXFLAGS="${rb_opt}" ;; #(
++  *) :
++     CXXFLAGS="$CXXFLAGS ${rb_opt}" ;;
++esac
++	done
++
++fi
+ 
+ case $RUBY_PATCHLEVEL in #(
+   -*) :
+@@ -19369,6 +19392,9 @@
+ 
+ fi
+ 
++fi
++
++{
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __atomic builtins" >&5
+ $as_echo_n "checking for __atomic builtins... " >&6; }
+ if ${rb_cv_gcc_atomic_builtins+:} false; then :
+@@ -19450,8 +19476,6 @@
+ 
+ fi
+ 
+-fi
+-
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_unreachable" >&5
+ $as_echo_n "checking for __builtin_unreachable... " >&6; }
+ if ${rb_cv_func___builtin_unreachable+:} false; then :
+@@ -19511,6 +19535,7 @@
+ 
+ 
+ fi
++}
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for exported function attribute" >&5
+ $as_echo_n "checking for exported function attribute... " >&6; }

data/config/patches/ruby/ruby-aix-atomic.patch

@@ -0,0 +1,11 @@
+--- ruby-2.1.2/ruby_atomic.h.orig	2014-09-29 14:08:29.000000000 -0500
++++ ruby-2.1.2/ruby_atomic.h	2014-09-29 14:08:41.000000000 -0500
+@@ -117,7 +117,7 @@
+ # endif
+ 
+ #else
+-typedef int rb_atomic_t;
++typedef long rb_atomic_t;
+ #define NEED_RUBY_ATOMIC_OPS
+ extern rb_atomic_t ruby_atomic_exchange(rb_atomic_t *ptr, rb_atomic_t val);
+ extern rb_atomic_t ruby_atomic_compare_and_swap(rb_atomic_t *ptr,

data/config/patches/ruby/ruby-aix-configure_26_and_later.patch

@@ -0,0 +1,19 @@
+--- ruby-2.6.0/configure.orig	2019-01-28 19:31:52.000000000 -0800
++++ ruby-2.6.0/configure	2019-01-28 19:30:18.000000000 -0800
+@@ -26791,6 +26791,7 @@
+ 			    LDSHARED="$LDSHARED ${linker_flag}-G"
+
+ fi
++			DLDFLAGS='-eInit_$(TARGET)'
+ 			EXTDLDFLAGS='-e$(TARGET_ENTRY)'
+ 			XLDFLAGS="${linker_flag}"'-bE:$(ARCHFILE)'" ${linker_flag}-brtl"
+ 			XLDFLAGS="$XLDFLAGS ${linker_flag}-blibpath:${prefix}/lib:${LIBPATH:-/usr/lib:/lib}"
+@@ -28066,7 +28067,8 @@
+ esac
+ 	done
+ 	LIBRUBYARG_SHARED='-L${libdir} -l${RUBY_SO_NAME}'
+-	LIBS="$LIBS -lm -lc"
++	LIBS="$LIBS -lm -lc -lz"
++	LIBRUBY_SO='lib$(RUBY_SO_NAME).a'
+ 	 ;; #(
+   darwin*) :

data/config/patches/ruby/ruby-aix-vm-core.patch

@@ -0,0 +1,14 @@
+--- ruby-2.1.2/vm_core.h.orig	2014-09-29 14:05:24.000000000 -0500
++++ ruby-2.1.2/vm_core.h	2014-09-29 14:05:39.000000000 -0500
+@@ -392,9 +392,9 @@
+ 
+     /* postponed_job */
+     struct rb_postponed_job_struct *postponed_job_buffer;
+-    int postponed_job_index;
++    long postponed_job_index;
+ 
+-    int src_encoding_index;
++    long src_encoding_index;
+ 
+     VALUE verbose, debug, orig_progname, progname;
+     VALUE coverages;