nagachika	2014-06-11 02:35:07 +0900 (Wed, 11 Jun 2014)

  New Revision: 46402

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

  Log:
    merge revision(s) r45378: [Backport #9658] [Backport #9866]
    
    * configure.in: Fix a build problem with clang and --with-opt-dir.
      If ruby is configured with --with-opt-dir=dir when using clang
      as compiler, a warning `clang: warning: argument unused during
      compilation: '-I dir'` is emitted almost every time clang
      compiles a file.  Unfortunately, RUBY_CHECK_PRINTF_PREFIX takes
      any output from the compiler as fatal error, and the check thus
      fails due to the warning.  This is an attempt to fix the problem
      by adding a flag -Qunused-arguments to CFLAGS locally in the
      function to suppress the warning. [ruby-dev:48062] [Bug #9658]
      [Fixes GH-571] https://github.com/ruby/ruby/pull/571

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/configure.in
    branches/ruby_2_1/version.h
Index: ruby_2_1/configure.in
===================================================================
--- ruby_2_1/configure.in	(revision 46401)
+++ ruby_2_1/configure.in	(revision 46402)
@@ -770,6 +770,8 @@ if test "$GCC:${warnflags+set}:no" = yes https://github.com/ruby/ruby/blob/trunk/ruby_2_1/configure.in#L770
     rb_cv_warnflags="$warnflags"
     warnflags=
 fi
+RUBY_TRY_CFLAGS(-Qunused-arguments, [RUBY_APPEND_OPTIONS(rb_cv_wsuppress_flags, -Qunused-arguments)])
+
 if test "$GCC" = yes; then
     # -D_FORTIFY_SOURCE
     # When defined _FORTIFY_SOURCE, glibc enables some additional sanity
@@ -1269,7 +1271,8 @@ RUBY_CHECK_SIZEOF(clock_t, [], [], [@%:@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/configure.in#L1271
 AC_DEFUN([RUBY_CHECK_PRINTF_PREFIX], [
 AC_CACHE_CHECK([for printf prefix for $1], [rb_cv_pri_prefix_]AS_TR_SH($1),[
     [rb_cv_pri_prefix_]AS_TR_SH($1)=[NONE]
-    RUBY_WERROR_FLAG(for pri in $2; do
+    RUBY_WERROR_FLAG(RUBY_APPEND_OPTIONS(CFLAGS, $rb_cv_wsuppress_flags)
+    for pri in $2; do
         AC_TRY_COMPILE(
             [@%:@include <stdio.h>
 	    @%:@include <stddef.h>
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 46401)
+++ ruby_2_1/ChangeLog	(revision 46402)
@@ -1,3 +1,16 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Wed Jun 11 02:27:55 2014  Akinori MUSHA  <knu@i...>
+
+	* configure.in: Fix a build problem with clang and --with-opt-dir.
+	  If ruby is configured with --with-opt-dir=dir when using clang
+	  as compiler, a warning `clang: warning: argument unused during
+	  compilation: '-I dir'` is emitted almost every time clang
+	  compiles a file.  Unfortunately, RUBY_CHECK_PRINTF_PREFIX takes
+	  any output from the compiler as fatal error, and the check thus
+	  fails due to the warning.  This is an attempt to fix the problem
+	  by adding a flag -Qunused-arguments to CFLAGS locally in the
+	  function to suppress the warning. [ruby-dev:48062] [Bug #9658]
+	  [Fixes GH-571] https://github.com/ruby/ruby/pull/571
+
 Wed Jun 11 02:18:34 2014  Marc-Andre Lafortune  <ruby-core@m...>
 
 	* numeric.c: Fix Numeric#step with 0 unit [Bug #9575]
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 46401)
+++ ruby_2_1/version.h	(revision 46402)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.2"
 #define RUBY_RELEASE_DATE "2014-06-11"
-#define RUBY_PATCHLEVEL 126
+#define RUBY_PATCHLEVEL 127
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 6

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r45378


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