https://git.ruby-lang.org/ruby.git/commit/?id=b76ad15ed0

From b76ad15ed0da636161de0243c547ee1e6fc95681 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Fri, 10 Sep 2021 14:19:00 +0900
Subject: Remove stale DLEXT2

Actually disabled at 181a3a2af5df88d145b73a060d51fe437c8c4ad4 in
2004,  it has remained in config.status and been carried over to
rbconfig.rb.
---
 configure.ac |  5 +----
 load.c       | 17 -----------------
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/configure.ac b/configure.ac
index c83145f..d2b3f8f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1662,7 +1662,7 @@ AC_CACHE_CHECK(for function name string predefined identifier, https://github.com/ruby/ruby/blob/trunk/configure.ac#L1662
       RUBY_WERROR_FLAG([
         for func in __func__ __FUNCTION__; do
             AC_LINK_IFELSE([AC_LANG_PROGRAM([[@%:@include <stdio.h>]],
-			 		    [[puts($func);]])],
+					    [[puts($func);]])],
             [rb_cv_function_name_string=$func
             break])
         done
@@ -2862,7 +2862,6 @@ AC_SUBST(CCDLFLAGS)dnl https://github.com/ruby/ruby/blob/trunk/configure.ac#L2862
 AC_SUBST(LDSHARED)dnl
 AC_SUBST(LDSHAREDXX)dnl
 AC_SUBST(DLEXT)dnl
-AC_SUBST(DLEXT2)dnl
 AC_SUBST(LIBEXT)dnl
 AC_SUBST(ASMEXT, S)dnl
 
@@ -3182,10 +3181,8 @@ AS_IF([test x"$LOAD_RELATIVE" = x1], [ https://github.com/ruby/ruby/blob/trunk/configure.ac#L3181
 
 len=2 # .rb
 n=`expr "$DLEXT"  : '.*'`; test "$n" -gt "$len" && len=$n
-n=`expr "$DLEXT2" : '.*'`; test "$n" -gt "$len" && len=$n
 AC_DEFINE_UNQUOTED(DLEXT_MAXLEN, `expr $len + 1`)
 test ".$DLEXT"  = "." || AC_DEFINE_UNQUOTED(DLEXT,  ".$DLEXT")
-test ".$DLEXT2" = "." || AC_DEFINE_UNQUOTED(DLEXT2, ".$DLEXT2")
 AC_SUBST(DLEXT)
 
 : "strip" && {
diff --git a/load.c b/load.c
index b236369..eaa2a59 100644
--- a/load.c
+++ b/load.c
@@ -21,17 +21,10 @@ static VALUE ruby_dln_librefs; https://github.com/ruby/ruby/blob/trunk/load.c#L21
 
 #define IS_RBEXT(e) (strcmp((e), ".rb") == 0)
 #define IS_SOEXT(e) (strcmp((e), ".so") == 0 || strcmp((e), ".o") == 0)
-#ifdef DLEXT2
-#define IS_DLEXT(e) (strcmp((e), DLEXT) == 0 || strcmp((e), DLEXT2) == 0)
-#else
 #define IS_DLEXT(e) (strcmp((e), DLEXT) == 0)
-#endif
 
 static const char *const loadable_ext[] = {
     ".rb", DLEXT,
-#ifdef DLEXT2
-    DLEXT2,
-#endif
     0
 };
 
@@ -931,15 +924,6 @@ search_required(VALUE fname, volatile VALUE *path, feature_func rb_feature_p) https://github.com/ruby/ruby/blob/trunk/load.c#L924
 		return 's';
 	    }
 	    tmp = rb_str_subseq(fname, 0, ext - RSTRING_PTR(fname));
-#ifdef DLEXT2
-	    OBJ_FREEZE(tmp);
-            if (rb_find_file_ext(&tmp, loadable_ext + 1)) {
-		ext = strrchr(ftptr = RSTRING_PTR(tmp), '.');
-		if (!rb_feature_p(ftptr, ext, FALSE, TRUE, &loading) || loading)
-		    *path = tmp;
-		return 's';
-	    }
-#else
 	    rb_str_cat2(tmp, DLEXT);
 	    OBJ_FREEZE(tmp);
             if ((tmp = rb_find_file(tmp)) != 0) {
@@ -948,7 +932,6 @@ search_required(VALUE fname, volatile VALUE *path, feature_func rb_feature_p) https://github.com/ruby/ruby/blob/trunk/load.c#L932
 		    *path = tmp;
 		return 's';
 	    }
-#endif
 	}
 	else if (IS_DLEXT(ext)) {
 	    if (rb_feature_p(ftptr, ext, FALSE, FALSE, &loading)) {
-- 
cgit v1.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/