To: vim_dev@googlegroups.com Subject: Patch 9.0.0928 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 9.0.0928 Problem: Using Ruby LDFLAGS may cause build problems. Solution: Do not add Ruby LDFLAGS to Vim's LDFLAGS. (Zdenek Dohnal, closes #11592) Files: src/configure.ac, src/auto/configure *** ../vim-9.0.0927/src/configure.ac 2022-11-05 15:13:45.415365583 +0000 --- src/configure.ac 2022-11-23 12:03:44.853621430 +0000 *************** *** 2034,2051 **** if test "X$librubyarg" != "X"; then RUBY_LIBS="$librubyarg $RUBY_LIBS" fi ! rubyldflags=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG[['LDFLAGS']]"` ! if test "X$rubyldflags" != "X"; then ! dnl Ruby on Mac OS X 10.5 adds "-arch" flags but these should only ! dnl be included if requested by passing --with-mac-arch to ! dnl configure, so strip these flags first (if present) ! rubyldflags=`echo "$rubyldflags" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'` ! if test "X$rubyldflags" != "X"; then ! if test "X`echo \"$LDFLAGS\" | $FGREP -e \"$rubyldflags\"`" = "X"; then ! LDFLAGS="$rubyldflags $LDFLAGS" ! fi ! fi ! fi RUBY_SRC="if_ruby.c" RUBY_OBJ="objects/if_ruby.o" RUBY_PRO="if_ruby.pro" --- 2034,2043 ---- 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. ! RUBY_SRC="if_ruby.c" RUBY_OBJ="objects/if_ruby.o" RUBY_PRO="if_ruby.pro" *** ../vim-9.0.0927/src/auto/configure 2022-11-05 15:13:45.419365585 +0000 --- src/auto/configure 2022-11-23 12:04:04.641639722 +0000 *************** *** 7683,7697 **** if test "X$librubyarg" != "X"; then RUBY_LIBS="$librubyarg $RUBY_LIBS" fi ! rubyldflags=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG['LDFLAGS']"` ! if test "X$rubyldflags" != "X"; then ! rubyldflags=`echo "$rubyldflags" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'` ! if test "X$rubyldflags" != "X"; then ! if test "X`echo \"$LDFLAGS\" | $FGREP -e \"$rubyldflags\"`" = "X"; then ! LDFLAGS="$rubyldflags $LDFLAGS" ! fi ! fi ! fi RUBY_SRC="if_ruby.c" RUBY_OBJ="objects/if_ruby.o" RUBY_PRO="if_ruby.pro" --- 7683,7690 ---- if test "X$librubyarg" != "X"; then RUBY_LIBS="$librubyarg $RUBY_LIBS" fi ! ! RUBY_SRC="if_ruby.c" RUBY_OBJ="objects/if_ruby.o" RUBY_PRO="if_ruby.pro" *** ../vim-9.0.0927/src/version.c 2022-11-23 11:36:16.525837135 +0000 --- src/version.c 2022-11-23 12:01:10.949445494 +0000 *************** *** 697,698 **** --- 697,700 ---- { /* Add new patch number below this line */ + /**/ + 928, /**/ -- hundred-and-one symptoms of being an internet addict: 117. You are more comfortable typing in html. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///