nagachika	2013-03-03 01:59:29 +0900 (Sun, 03 Mar 2013)

  New Revision: 39564

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

  Log:
    merge revision(s) 39214,39221: [Backport #7830]
    
    configure.in: Werror-implicit-function-declaration
    
    * configure.in (warnflags): -Werror-implicit-function-declaration
      haven't been used as-is, but always replaced with -Werror= or -W.
    * configure.in (warnflags): disable -Werror by default unless
      development.  [ruby-core:52131] [Bug #7830]

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

Index: ruby_2_0_0/configure.in
===================================================================
--- ruby_2_0_0/configure.in	(revision 39563)
+++ ruby_2_0_0/configure.in	(revision 39564)
@@ -172,6 +172,7 @@ RUBY_PROGRAM_VERSION=`sed -n 's/^#define https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/configure.in#L172
 AC_SUBST(RUBY_PROGRAM_VERSION)
 RUBY_RELEASE_DATE=`sed -n 's/^#define RUBY_RELEASE_DATE "\(.*\)"/\1/p' $srcdir/version.h`
 AC_SUBST(RUBY_RELEASE_DATE)
+RUBY_PATCHLEVEL=`sed -n 's/^#define RUBY_PATCHLEVEL //p' $srcdir/version.h`
 AC_DEFINE(CANONICALIZATION_FOR_MATHN)
 dnl checks for alternative programs
 AC_CANONICAL_BUILD
@@ -592,9 +593,17 @@ AC_DEFUN(RUBY_TRY_LDFLAGS, [ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/configure.in#L593
     save_LDFLAGS=
 ])
 
+AS_CASE([$RUBY_PATCHLEVEL], [-*],
+	[particular_werror_flags=yes], [particular_werror_flags=no])
+AC_ARG_ENABLE(werror,
+	AS_HELP_STRING([--disable-werror],
+		       [don't make warnings into errors
+		       even if a compiler support -Werror feature
+		       [[disabled by default unless development version]]]),
+	[particular_werror_flags=$enableval])
+
 rb_cv_warnflags="$warnflags"
 if test "$GCC:${warnflags+set}:no" = yes::no; then
-    particular_werror_flags=yes
     for wflag in -Wno-unused-parameter -Wno-parentheses -Wno-long-long \
 		 -Wno-missing-field-initializers \
 		 -Wunused-variable \
@@ -602,11 +611,9 @@ if test "$GCC:${warnflags+set}:no" = yes https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/configure.in#L611
 		 -Werror=write-strings \
 		 -Werror=declaration-after-statement \
 		 -Werror=shorten-64-to-32 \
-		 -Werror-implicit-function-declaration \
+		 -Werror=implicit-function-declaration \
 		 ; do
-	if test "$particular_werror_flags" = yes; then
-	    wflag=`echo x$wflag | sed 's/^x-Werror-/-Werror=/;s/^x//'`
-	else
+	if test "$particular_werror_flags" != yes; then
 	    wflag=`echo x$wflag | sed 's/^x-Werror=/-W/;s/^x//'`
 	fi
 	ok=no
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39563)
+++ ruby_2_0_0/ChangeLog	(revision 39564)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sun Mar  3 01:57:50 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (warnflags): disable -Werror by default unless
+	  development.  [ruby-core:52131] [Bug #7830]
+
 Wed Feb 27 00:20:43 2013  KOSAKI Motohiro  <kosaki.motohiro@g...>
 
 	* test/ruby/test_process.rb (test_setsid): Added a workaround for
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39563)
+++ ruby_2_0_0/version.h	(revision 39564)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-03-03"
-#define RUBY_PATCHLEVEL 3
+#define RUBY_PATCHLEVEL 4
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39214,39221


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