patch 9.2.0674: configure: clears dynamic ruby linker flags

Problem:  configure: clears dynamic ruby linker flags, after setting those
Solution: Make configure keep Ruby linker arguments when Ruby support is
          built with --enable-rubyinterp=dynamic.  The dynamic Ruby
          branch clears RUBY_LIBS before setting DYNAMIC_RUBY, so add librubyarg
          after that branch instead of before it (Vladimír Marek).

related: #17906
closes:  #20558

Signed-off-by: Vladimír Marek <vlmarek13@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/auto/configure b/src/auto/configure
index 483beff826da179dc5fc02d4cd47e3325527ed2f..bcbeb525cc1945f5115f5f8ebf13152e5c99e5f5 100755 (executable)
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -8599,10 +8599,6 @@ printf "%s\n" "$rubyhdrdir" >&6; }
          RUBY_LIBS="$RUBY_LIBS -L$rubylibdir"
        fi
 
-       if test "X$librubyarg" != "X"; then
-         RUBY_LIBS="$librubyarg $RUBY_LIBS"
-       fi
-
 
        RUBY_SRC="if_ruby.c"
        RUBY_OBJ="objects/if_ruby.o"
@@ -8618,6 +8614,9 @@ printf "%s\n" "$rubyhdrdir" >&6; }
          RUBY_CFLAGS="-DDYNAMIC_RUBY_DLL=\\\"$libruby_soname\\\" $RUBY_CFLAGS"
          RUBY_LIBS=
        fi
+       if test "X$librubyarg" != "X"; then
+         RUBY_LIBS="$librubyarg $RUBY_LIBS"
+       fi
        if test "X$CLANG_VERSION" != "X" -a "$rubyversion" -ge 30; then
          RUBY_CFLAGS="$RUBY_CFLAGS -fdeclspec"
        fi

diff --git a/src/configure.ac b/src/configure.ac
index 06f03344cdc2e4c9fc85a9e6e7901667c872e676..bac22369882eee6f491c21b36b26e012c679da44 100644 (file)
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -2148,10 +2148,6 @@ if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then
          RUBY_LIBS="$RUBY_LIBS -L$rubylibdir"
        fi
 
-       if test "X$librubyarg" != "X"; then
-         RUBY_LIBS="$librubyarg $RUBY_LIBS"
-       fi
-
        dnl Here the Ruby LDFLAGS used to be added to LDFLAGS, but that turns
        dnl out to cause trouble and was removed.
 
@@ -2167,6 +2163,9 @@ if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then
          RUBY_CFLAGS="-DDYNAMIC_RUBY_DLL=\\\"$libruby_soname\\\" $RUBY_CFLAGS"
          RUBY_LIBS=
        fi
+       if test "X$librubyarg" != "X"; then
+         RUBY_LIBS="$librubyarg $RUBY_LIBS"
+       fi
        if test "X$CLANG_VERSION" != "X" -a "$rubyversion" -ge 30; then
          RUBY_CFLAGS="$RUBY_CFLAGS -fdeclspec"
        fi

diff --git a/src/version.c b/src/version.c
index 14ba1f8ed1b17b1d86751a728bc89bb4b571938a..c47616512130c48295c6e19cd20fdc9738849c27 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -759,6 +759,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    674,
 /**/
     673,
 /**/