patch 9.0.0928: using Ruby LDFLAGS may cause build problems

Problem:    Using Ruby LDFLAGS may cause build problems.
Solution:   Do not add Ruby LDFLAGS to Vim's LDFLAGS. (Zdenek Dohnal,
            closes #11592)

diff --git a/src/auto/configure b/src/auto/configure
index 644daaeec4657210a1c9910ad2ac457ae8fd1091..92826d4d6d6c1b24aa31d05d86aba23484ed14dd 100755 (executable)
--- 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 16ecd101d19b1e7bba454e1d8893757e48c64cb0..a5beb834dc6c227395117a25b20242e62bef7c94 100644 (file)
--- 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 6e0d886b028d6b32798f47f3d6783b55ce081425..bb8dd6396a04cc99772f0c1bb7d821b55057f88f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    928,
 /**/
     927,
 /**/