naruse	2012-02-08 10:39:43 +0900 (Wed, 08 Feb 2012)

  New Revision: 34474

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34474

  Log:
    merge revision(s) 33934: [Backport #5975]
    
    * Makefile.in (CFLAGS): append ARCH_FLAG.
    
    * configure.in (ARCH_FLAG): exclude from CFLAGS.

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/Makefile.in
    branches/ruby_1_9_3/configure.in
    branches/ruby_1_9_3/lib/mkmf.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/configure.in
===================================================================
--- ruby_1_9_3/configure.in	(revision 34473)
+++ ruby_1_9_3/configure.in	(revision 34474)
@@ -2692,9 +2692,9 @@
 fi
 if test "${ARCH_FLAG}"; then
     archflagpat=`eval echo '"'"${ARCH_FLAG}"'"' | sed 's/[[][|.*]]/\\&/g'`
-    CFLAGS=`echo "$CFLAGS" | sed "s|$archflagpat"'|$(ARCH_FLAG)|'`
-    CXXFLAGS=`echo "$CXXFLAGS" | sed "s|$archflagpat"'|$(ARCH_FLAG)|'`
-    LDFLAGS=`echo "$LDFLAGS" | sed "s|$archflagpat"'|$(ARCH_FLAG)|'`
+    CFLAGS=`echo "$CFLAGS" | sed "s| *$archflagpat"'||'`
+    CXXFLAGS=`echo "$CXXFLAGS" | sed "s| *$archflagpat"'||'`
+    LDFLAGS=`echo "$LDFLAGS" | sed "s| *$archflagpat"'||'`
 fi
 warnflags="$rb_cv_warnflags"
 AC_SUBST(cppflags, [])dnl
Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34473)
+++ ruby_1_9_3/ChangeLog	(revision 34474)
@@ -1,3 +1,9 @@
+Wed Feb  8 10:38:36 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* Makefile.in (CFLAGS): append ARCH_FLAG.
+
+	* configure.in (ARCH_FLAG): exclude from CFLAGS.
+
 Wed Feb 08 09:19:00 2012  Martin Bosslet  <Martin.Bosslet@g...>
 
 	* ext/openssl/ossl_cipher.c: Add warning about key as IV.
Index: ruby_1_9_3/lib/mkmf.rb
===================================================================
--- ruby_1_9_3/lib/mkmf.rb	(revision 34473)
+++ ruby_1_9_3/lib/mkmf.rb	(revision 34474)
@@ -1694,7 +1694,7 @@
 optflags = #{CONFIG['optflags']}
 debugflags = #{CONFIG['debugflags']}
 warnflags = #{$warnflags}
-CFLAGS   = #{$static ? '' : CONFIG['CCDLFLAGS']} #$CFLAGS #$ARCH_FLAG
+CFLAGS   = #{$static ? '' : CONFIG['CCDLFLAGS']} #$CFLAGS $(ARCH_FLAG)
 INCFLAGS = -I. #$INCFLAGS
 DEFS     = #{CONFIG['DEFS']}
 CPPFLAGS = #{extconf_h}#{$CPPFLAGS}
@@ -1702,7 +1702,7 @@
 ldflags  = #{$LDFLAGS}
 dldflags = #{$DLDFLAGS}
 ARCH_FLAG = #{$ARCH_FLAG}
-DLDFLAGS = $(ldflags) $(dldflags)
+DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG)
 LDSHARED = #{CONFIG['LDSHARED']}
 LDSHAREDXX = #{config_string('LDSHAREDXX') || '$(LDSHARED)'}
 AR = #{CONFIG['AR']}
Index: ruby_1_9_3/Makefile.in
===================================================================
--- ruby_1_9_3/Makefile.in	(revision 34473)
+++ ruby_1_9_3/Makefile.in	(revision 34474)
@@ -48,7 +48,7 @@
 OUTFLAG = @OUTFLAG@$(empty)
 COUTFLAG = @COUTFLAG@$(empty)
 ARCH_FLAG = @ARCH_FLAG@
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ $(ARCH_FLAG)
 cflags = @cflags@
 optflags = @optflags@
 debugflags = @debugflags@
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34473)
+++ ruby_1_9_3/version.h	(revision 34474)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 57
+#define RUBY_PATCHLEVEL 58
 
 #define RUBY_RELEASE_DATE "2012-02-08"
 #define RUBY_RELEASE_YEAR 2012

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/