patch 9.0.1966: configure prints stray 6 when checking libruby
Commit:
https://github.com/vim/vim/commit/e379e21ddc2dc12abea9dcfd0708e27788bb568c
Author: Illia Bobyr <illia.bo...@gmail.com>
Date: Sat Sep 30 22:59:27 2023 +0200
patch 9.0.1966: configure prints stray 6 when checking libruby
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 <c...@256bit.org>
Co-authored-by: Illia Bobyr <illia.bo...@gmail.com>
diff --git a/src/auto/configure b/src/auto/configure
index acc844c89..b86b3912e 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -8102,7 +8102,7 @@ printf "%s
" "$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"
diff --git a/src/configure.ac b/src/configure.ac
index 4b2046dd5..dfbe51237 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -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
diff --git a/src/version.c b/src/version.c
index 2371c3fa7..2c3c9f1bf 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 1966,
/**/
1965,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1qmhIl-001gTC-47%40256bit.org.
