Skip to content

Commit e379e21

Browse files
illia-bobyrchrisbra
authored andcommitted
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 <[email protected]> Co-authored-by: Illia Bobyr <[email protected]>
1 parent 8c358e0 commit e379e21

3 files changed

Lines changed: 4 additions & 2 deletions

File tree

src/auto/configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8102,7 +8102,7 @@ printf "%s\n" "$rubyhdrdir" >&6; }
81028102
librubyarg=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['LIBRUBYARG'])"`
81038103
librubya=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['LIBRUBY_A'])"`
81048104
rubylibdir=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['libdir'])"`
8105-
if test -f "$rubylibdir/$librubya" || expr "$librubyarg" : "-lruby"; then
8105+
if test -f "$rubylibdir/$librubya" || expr "$librubyarg" : "-lruby" >/dev/null; then
81068106
RUBY_LIBS="$RUBY_LIBS -L$rubylibdir"
81078107
elif test "$librubyarg" = "libruby.a"; then
81088108
librubyarg="-lruby"

src/configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2077,7 +2077,7 @@ if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then
20772077
librubyarg=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG[['LIBRUBYARG']])"`
20782078
librubya=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG[['LIBRUBY_A']])"`
20792079
rubylibdir=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG[['libdir']])"`
2080-
if test -f "$rubylibdir/$librubya" || expr "$librubyarg" : "-lruby"; then
2080+
if test -f "$rubylibdir/$librubya" || expr "$librubyarg" : "-lruby" >/dev/null; then
20812081
RUBY_LIBS="$RUBY_LIBS -L$rubylibdir"
20822082
elif test "$librubyarg" = "libruby.a"; then
20832083
dnl required on Mac OS 10.3 where libruby.a doesn't exist

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -704,6 +704,8 @@ static char *(features[]) =
704704

705705
static int included_patches[] =
706706
{ /* Add new patch number below this line */
707+
/**/
708+
1966,
707709
/**/
708710
1965,
709711
/**/

0 commit comments

Comments
 (0)