diff options
| author | Zdenek Dohnal <zdohnal@redhat.com> | 2022-11-23 12:06:08 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-11-23 12:06:08 +0000 |
| commit | 1d822afaf66a84fab71c84521fd92db11d2c8925 (patch) | |
| tree | 622070ab8e435d4cd4556d473a6a782f2a530668 | |
| parent | 96cbbe29debba25d7eec8d01955c5ac01f5c420d (diff) | |
patch 9.0.0928: using Ruby LDFLAGS may cause build problemsv9.0.0928
Problem: Using Ruby LDFLAGS may cause build problems.
Solution: Do not add Ruby LDFLAGS to Vim's LDFLAGS. (Zdenek Dohnal,
closes #11592)
| -rwxr-xr-x | src/auto/configure | 11 | ||||
| -rw-r--r-- | src/configure.ac | 16 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 8 insertions, 21 deletions
diff --git a/src/auto/configure b/src/auto/configure index 644daaeec4..92826d4d6d 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -7683,15 +7683,8 @@ $as_echo "$rubyhdrdir" >&6; } 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" diff --git a/src/configure.ac b/src/configure.ac index 16ecd101d1..a5beb834dc 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -2034,18 +2034,10 @@ if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then 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 + + 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" diff --git a/src/version.c b/src/version.c index 6e0d886b02..bb8dd6396a 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 928, +/**/ 927, /**/ 926, |