updated for version 7.2-236

diff --git a/src/auto/configure b/src/auto/configure
index 42f4784ddc7e9beed426b9e00c443ad5b1b67fc0..1049c0ceb300a8da736c4beb8b27b99eef12f4ca 100755 (executable)
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -5780,7 +5780,10 @@ $as_echo "$rubyhdrdir" >&6; }
        fi
        rubyldflags=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG["LDFLAGS"]'`
        if test "X$rubyldflags" != "X"; then
-         LDFLAGS="$rubyldflags $LDFLAGS"
+                                 rubyldflags=`echo "$rubyldflags" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//'`
+         if test "X$rubyldflags" != "X"; then
+           LDFLAGS="$rubyldflags $LDFLAGS"
+         fi
        fi
        RUBY_SRC="if_ruby.c"
        RUBY_OBJ="objects/if_ruby.o"

diff --git a/src/configure.in b/src/configure.in
index eb7db7674727710fe20d0c16831dd0df1dcdf8d4..1ad32d7a3a1b0d4b2c8d9797a3eb6b7bcdaeae94 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -984,7 +984,13 @@ if test "$enable_rubyinterp" = "yes"; then
        fi
        rubyldflags=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG[["LDFLAGS"]]'`
        if test "X$rubyldflags" != "X"; then
-         LDFLAGS="$rubyldflags $LDFLAGS"
+         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//'`
+         if test "X$rubyldflags" != "X"; then
+           LDFLAGS="$rubyldflags $LDFLAGS"
+         fi
        fi
        RUBY_SRC="if_ruby.c"
        RUBY_OBJ="objects/if_ruby.o"

diff --git a/src/version.c b/src/version.c
index 8e5594266898e8a2b397184edd35b3dc11635a8b..fc4da307b835986e12ec9627b639363478705923 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    236,
 /**/
     235,
 /**/