File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -5722,7 +5722,7 @@ $as_echo "OK" >&6; }
57225722 -e ' s/-fdebug-prefix-map[^ ]*//g' \
57235723 -e ' s/-pipe //' \
57245724 -e ' s/-W[^ ]*//g' \
5725- -e ' s/-D_FORTIFY_SOURCE=.//g' `
5725+ -e ' s/-D_FORTIFY_SOURCE=.//g' `
57265726 perllibs=` cd $srcdir ; $vi_cv_path_perl -MExtUtils::Embed -e ' ldopts' | \
57275727 sed -e ' /Warning/d' -e ' /Note (probably harmless)/d' \
57285728 -e ' s/-bE:perl.exp//' -e ' s/-lc //' `
@@ -7200,10 +7200,10 @@ $as_echo "$rubyhdrdir" >&6; }
72007200 $as_echo " #define FEAT_RUBY 1" >> confdefs.h
72017201
72027202 if test " $enable_rubyinterp " = " dynamic" ; then
7203- libruby =` $vi_cv_path_ruby -r rbconfig -e " puts $ruby_rbconfig ::CONFIG['LIBRUBY_SO' ]" `
7203+ libruby_soname =` $vi_cv_path_ruby -r rbconfig -e " puts $ruby_rbconfig ::CONFIG['LIBRUBY_ALIASES'].split[0 ]" `
72047204 $as_echo " #define DYNAMIC_RUBY 1" >> confdefs.h
72057205
7206- RUBY_CFLAGS=" -DDYNAMIC_RUBY_DLL=\\\" $libruby \\\" -DDYNAMIC_RUBY_VER=$rubyversion $RUBY_CFLAGS "
7206+ RUBY_CFLAGS=" -DDYNAMIC_RUBY_DLL=\\\" $libruby_soname \\\" -DDYNAMIC_RUBY_VER=$rubyversion $RUBY_CFLAGS "
72077207 RUBY_LIBS=
72087208 fi
72097209 else
Original file line number Diff line number Diff line change @@ -1902,9 +1902,9 @@ if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then
19021902 RUBY_PRO="if_ruby.pro"
19031903 AC_DEFINE ( FEAT_RUBY )
19041904 if test "$enable_rubyinterp" = "dynamic"; then
1905- libruby =`$vi_cv_path_ruby -r rbconfig -e "puts $ruby_rbconfig::CONFIG[ [ 'LIBRUBY_SO' ] ] "`
1905+ libruby_soname =`$vi_cv_path_ruby -r rbconfig -e "puts $ruby_rbconfig::CONFIG[ [ 'LIBRUBY_ALIASES' ] ] .split [ [ 0 ] ] "`
19061906 AC_DEFINE ( DYNAMIC_RUBY )
1907- RUBY_CFLAGS="-DDYNAMIC_RUBY_DLL=\\\"$libruby \\\" -DDYNAMIC_RUBY_VER=$rubyversion $RUBY_CFLAGS"
1907+ RUBY_CFLAGS="-DDYNAMIC_RUBY_DLL=\\\"$libruby_soname \\\" -DDYNAMIC_RUBY_VER=$rubyversion $RUBY_CFLAGS"
19081908 RUBY_LIBS=
19091909 fi
19101910 else
Original file line number Diff line number Diff line change @@ -761,6 +761,8 @@ static char *(features[]) =
761761
762762static int included_patches [] =
763763{ /* Add new patch number below this line */
764+ /**/
765+ 1185 ,
764766/**/
765767 1184 ,
766768/**/
You can’t perform that action at this time.
0 commit comments