]> git.ipfire.org Git - thirdparty/vim.git/commitdiff
patch 9.0.1966: configure prints stray 6 when checking libruby v9.0.1966
authorIllia Bobyr <illia.bobyr@gmail.com>
Sat, 30 Sep 2023 20:59:27 +0000 (22:59 +0200)
committerChristian Brabandt <cb@256bit.org>
Sat, 30 Sep 2023 20:59:27 +0000 (22:59 +0200)
Problem:  configure prints stray 6 when checking libruby
Solution: redirect stdout to dev/null

configure: Do not print "6" when checking for libruby

`expr` will print the matched string length to the standard output.
Current `configure` output looks like this:

```
checking Ruby header files...  /usr/include/ruby-3.1.0
6
```

The script really only cares about `expr` exit code.

closes: #13234

Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Illia Bobyr <illia.bobyr@gmail.com>
src/auto/configure
src/configure.ac
src/version.c

index acc844c8936d642a4f9c5e26924e8054cf03d0c9..b86b3912e2632cd95e2188a76d9fe1362f5789b9 100755 (executable)
@@ -8102,7 +8102,7 @@ printf "%s\n" "$rubyhdrdir" >&6; }
        librubyarg=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['LIBRUBYARG'])"`
        librubya=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['LIBRUBY_A'])"`
        rubylibdir=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['libdir'])"`
-       if test -f "$rubylibdir/$librubya" || expr "$librubyarg" : "-lruby"; then
+       if test -f "$rubylibdir/$librubya" || expr "$librubyarg" : "-lruby" >/dev/null; then
          RUBY_LIBS="$RUBY_LIBS -L$rubylibdir"
        elif test "$librubyarg" = "libruby.a"; then
                  librubyarg="-lruby"
index 4b2046dd526b9e1c827476939552bb94f39d4094..dfbe512371d4b20a51423ad14f96afa7cdcad467 100644 (file)
@@ -2077,7 +2077,7 @@ if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then
        librubyarg=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG[['LIBRUBYARG']])"`
        librubya=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG[['LIBRUBY_A']])"`
        rubylibdir=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG[['libdir']])"`
-       if test -f "$rubylibdir/$librubya" || expr "$librubyarg" : "-lruby"; then
+       if test -f "$rubylibdir/$librubya" || expr "$librubyarg" : "-lruby" >/dev/null; then
          RUBY_LIBS="$RUBY_LIBS -L$rubylibdir"
        elif test "$librubyarg" = "libruby.a"; then
          dnl required on Mac OS 10.3 where libruby.a doesn't exist
index 2371c3fa7c64215c3db6376cfdf6912f51a7986e..2c3c9f1bf5fcc7fee0186edb02835c3c221311a2 100644 (file)
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1966,
 /**/
     1965,
 /**/