diff options
Diffstat (limited to 'lang/ruby30-base/patches/patch-configure')
| -rw-r--r-- | lang/ruby30-base/patches/patch-configure | 75 |
1 files changed, 44 insertions, 31 deletions
diff --git a/lang/ruby30-base/patches/patch-configure b/lang/ruby30-base/patches/patch-configure index e8c89b4d0f5..6b243ea98e3 100644 --- a/lang/ruby30-base/patches/patch-configure +++ b/lang/ruby30-base/patches/patch-configure @@ -1,4 +1,4 @@ -$NetBSD: patch-configure,v 1.2 2022/05/04 15:49:16 jperkin Exp $ +$NetBSD: patch-configure,v 1.2.4.1 2022/11/30 17:25:43 bsiegert Exp $ * Adding Interix support. * Ignore doxygen. @@ -7,26 +7,26 @@ $NetBSD: patch-configure,v 1.2 2022/05/04 15:49:16 jperkin Exp $ * Retain _XOPEN_SOURCE, fixes eventmachine. * Fix argument for pthread_self() on NetBSD. ---- configure.orig 2022-04-12 11:48:57.000000000 +0000 +--- configure.orig 2022-11-24 11:04:58.000000000 +0000 +++ configure -@@ -8381,7 +8381,7 @@ else - if test x"$target_alias" = x; then : +@@ -9270,7 +9270,7 @@ else $as_nop + then : case "$target_os" in #( - darwin*) : + nodarwin*) : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5 - $as_echo_n "checking for real target cpu... " >&6; } -@@ -10094,6 +10094,7 @@ fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5 + printf %s "checking for real target cpu... " >&6; } +@@ -11095,6 +11095,7 @@ fi stack_protector=no ;; #( *) : + stack_protector=no ;; esac - if test -z "${stack_protector+set}"; then : -@@ -11794,18 +11795,6 @@ fi + if test -z "${stack_protector+set}" +@@ -12893,18 +12894,6 @@ then : CPPFLAGS="$CPPFLAGS ${rb_opt}" ;; esac done @@ -45,7 +45,7 @@ $NetBSD: patch-configure,v 1.2 2022/05/04 15:49:16 jperkin Exp $ fi -@@ -11970,6 +11959,10 @@ esac +@@ -13060,6 +13049,10 @@ esac ac_cv_func___builtin_setjmp=no ;; #( @@ -56,16 +56,18 @@ $NetBSD: patch-configure,v 1.2 2022/05/04 15:49:16 jperkin Exp $ *) : ;; esac -@@ -23324,6 +23317,8 @@ else - # ifdef _MSC_VER - # include <malloc.h> - # define alloca _alloca -+# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) +@@ -24715,7 +24708,9 @@ else + #include <stdlib.h> + #include <stddef.h> + #ifndef alloca +-# ifdef __GNUC__ ++# if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) +# include <stdlib.h> - # else - # ifdef HAVE_ALLOCA_H - # include <alloca.h> -@@ -28622,7 +28617,9 @@ fi ++# elif defined __GNUC__ + # define alloca __builtin_alloca + # elif defined _MSC_VER + # include <malloc.h> +@@ -29662,7 +29657,9 @@ fi interix*) : : ${LDSHARED='$(CC) -shared'} XLDFLAGS="$XLDFLAGS -Wl,-E" @@ -75,16 +77,25 @@ $NetBSD: patch-configure,v 1.2 2022/05/04 15:49:16 jperkin Exp $ rb_cv_dlopen=yes ;; #( freebsd*|dragonfly*) : -@@ -29890,7 +29887,7 @@ fi +@@ -29833,7 +29830,7 @@ fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $flag is accepted for bundle" >&5 + printf %s "checking whether $flag is accepted for bundle... " >&6; } + : > conftest.c +- if ${LDSHARED/'$(CC)'/$CC} -o conftest.bundle $flag conftest.c >/dev/null 2>conftest.err && ++ if $(echo ${LDSHARED} | sed -e "s/'$(CC)'/$CC/g") -o conftest.bundle $flag conftest.c >/dev/null 2>conftest.err && + test ! -s conftest.err + then : + +@@ -30991,7 +30988,7 @@ fi ;; #( freebsd*|dragonfly*) : - LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)' + LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)$(TEENY)' LIBRUBY_SONAME='$(LIBRUBY_SO)' - if test "$rb_cv_binary_elf" != "yes" ; then : - -@@ -29969,9 +29966,10 @@ esac + if test "$rb_cv_binary_elf" != "yes" + then : +@@ -31072,9 +31069,10 @@ esac ;; #( darwin*) : @@ -94,10 +105,10 @@ $NetBSD: patch-configure,v 1.2 2022/05/04 15:49:16 jperkin Exp $ - LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).$(SOEXT)' + LIBRUBY_SONAME='lib$(RUBY_BASE_NAME).$(RUBY_API_VERSION).$(SOEXT)' + LIBRUBY_ALIASES='$(LIBRUBY_SONAME) lib$(RUBY_INSTALL_NAME).$(SOEXT)' - if test "$load_relative" = yes; then : + if test "$load_relative" = yes + then : - libprefix="@executable_path/../${libdir_basename}" -@@ -29992,7 +29990,12 @@ fi +@@ -31097,7 +31095,12 @@ fi ;; #( interix*) : @@ -111,7 +122,7 @@ $NetBSD: patch-configure,v 1.2 2022/05/04 15:49:16 jperkin Exp $ ;; #( mingw*|cygwin*|mswin*) : -@@ -30174,7 +30177,7 @@ if test "$enable_rpath" = yes; then : +@@ -31290,7 +31293,7 @@ then : esac rpathflag=`IFS="$PATH_SEPARATOR" echo x "$rpathflag" | @@ -120,19 +131,21 @@ $NetBSD: patch-configure,v 1.2 2022/05/04 15:49:16 jperkin Exp $ ` LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}" LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED" -@@ -32906,19 +32909,7 @@ which seems to be undefined. Please mak +@@ -34101,21 +34104,7 @@ which seems to be undefined. Please mak "Makefile":F) tmpmk=confmk$$.tmp { -- if test ${VCS+set}; then : +- if test ${VCS+set} +-then : - - : - --elif git_dir=`$GIT --work-tree="$srcdir" --git-dir="$srcdir/.git" rev-parse --git-dir 2>/dev/null`; then : +-elif git_dir=`$GIT --work-tree="$srcdir" --git-dir="$srcdir/.git" rev-parse --git-dir 2>/dev/null` +-then : - - VCS='$(GIT)' - --else +-else $as_nop - VCS='echo cannot' - |