knu	2013-02-23 13:00:21 +0900 (Sat, 23 Feb 2013)

  New Revision: 39421

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

  Log:
    merge revision(s) r39255:
    
    * configure.in: Fix a bug introduced in r38342 that the cflagspat
      substitution is messed up by the way CFLAGS and optflags are
      modified, which affected FreeBSD and NetBSD/amd64 when
      configured to use libexecinfo.  This bug resulted in CFLAGS and
      CXXFLAGS in RbConfig::CONFIG having warnflags expanded in them,
      forcing third-party C/C++ extensions to follow what warnflags
      demands, like ANSI/ISO-C90 conformance.  ref [Bug #7101]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/configure.in

Index: ruby_2_0_0/configure.in
===================================================================
--- ruby_2_0_0/configure.in	(revision 39420)
+++ ruby_2_0_0/configure.in	(revision 39421)
@@ -2389,8 +2389,15 @@ AS_CASE(["$target_cpu-$target_os"], https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/configure.in#L2389
 	execinfo_frame_pointer=no
 	RUBY_TRY_CFLAGS(-fno-omit-frame-pointer, [execinfo_frame_pointer=yes])
 	if test "x$execinfo_frame_pointer" = xyes; then
-	    optflags="${optflags+$optflags }-fno-omit-frame-pointer"
-	    CFLAGS="$CFLAGS -fno-omit-frame-pointer"
+	    # optflags must be manipulated very carefully.  For the
+	    # later cflagspat/cxxflagspat substitution to work, CFLAGS
+	    # and CXXFLAGS must start exactly with the value of
+	    # optflags.
+	    CFLAGS="${CFLAGS# }"; CFLAGS="${CFLAGS#"$optflags "}"
+	    CXXFLAGS="${CXXFLAGS# }"; CXXFLAGS="${CXXFLAGS#"$optflags "}"
+	    RUBY_APPEND_OPTION(optflags, -fno-omit-frame-pointer)
+	    CFLAGS=" $optflags $CFLAGS"
+	    CXXFLAGS=" $optflags $CXXFLAGS"
 	fi
     fi])
 AC_CHECK_FUNCS(backtrace)
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39420)
+++ ruby_2_0_0/ChangeLog	(revision 39421)
@@ -1,3 +1,13 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sat Feb 23 13:00:07 2013  Akinori MUSHA  <knu@i...>
+
+	* configure.in: Fix a bug introduced in r38342 that the cflagspat
+	  substitution is messed up by the way CFLAGS and optflags are
+	  modified, which affected FreeBSD and NetBSD/amd64 when
+	  configured to use libexecinfo.  This bug resulted in CFLAGS and
+	  CXXFLAGS in RbConfig::CONFIG having warnflags expanded in them,
+	  forcing third-party C/C++ extensions to follow what warnflags
+	  demands, like ANSI/ISO-C90 conformance.  ref [Bug #7101]
+
 Sat Feb 23 12:58:32 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/mkmf.rb: remove extra topdir in VPATH, which was in

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39255


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