diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-05-09 07:00:10 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-05-09 07:00:10 +0000 |
| commit | 9a10c9726115e7f3f31bb228ad41d5f17eecb5e5 (patch) | |
| tree | 84d18c0a8ef6a35095f173bd37a5db3cdd6c45ea | |
| parent | 2099780eb653e46bd46d68939e04c7a2ebe2f13a (diff) | |
merge revision(s) 33978:
* configure.in (RUBY_WERROR_FLAG): append all warning flags which
are enabled to compile, so that printf format modifiers properly
fail. [ruby-core:41351] [Bug #5679]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35603 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.in | 9 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 14 insertions, 7 deletions
@@ -1,3 +1,9 @@ +Wed May 9 15:59:17 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (RUBY_WERROR_FLAG): append all warning flags which + are enabled to compile, so that printf format modifiers properly + fail. [ruby-core:41351] [Bug #5679] + Mon May 7 20:23:29 2012 Tanaka Akira <akr@fsij.org> * lib/securerandom.rb (random_bytes): call to_int method for the diff --git a/configure.in b/configure.in index 6d2468987c..f2af0ee910 100644 --- a/configure.in +++ b/configure.in @@ -409,6 +409,8 @@ dnl } dnl compiler section { AC_DEFUN([RUBY_WERROR_FLAG], [dnl +save_CFLAGS="$CFLAGS" +CFLAGS="$CFLAGS $rb_cv_warnflags" if test "${ac_c_werror_flag+set}"; then rb_c_werror_flag="$ac_c_werror_flag" else @@ -416,6 +418,8 @@ else fi ac_c_werror_flag=yes $1 +CFLAGS="$save_CFLAGS" +save_CFLAGS= if test "${rb_c_werror_flag+set}"; then ac_c_werror_flag="$rb_c_werror_flag" else @@ -423,18 +427,15 @@ else fi]) AC_DEFUN(RUBY_TRY_CFLAGS, [ - save_CFLAGS="$CFLAGS" - CFLAGS="[$]CFLAGS $1" AC_MSG_CHECKING([whether ]$1[ is accepted]) RUBY_WERROR_FLAG([ + CFLAGS="[$]CFLAGS $1" AC_TRY_COMPILE([$4], [$5], [$2 AC_MSG_RESULT(yes)], [$3 AC_MSG_RESULT(no)]) ]) - CFLAGS="$save_CFLAGS" - save_CFLAGS= ]) AC_DEFUN(RUBY_TRY_LDFLAGS, [ @@ -1,10 +1,10 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 206 +#define RUBY_PATCHLEVEL 207 -#define RUBY_RELEASE_DATE "2012-05-07" +#define RUBY_RELEASE_DATE "2012-05-09" #define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_MONTH 5 -#define RUBY_RELEASE_DAY 7 +#define RUBY_RELEASE_DAY 9 #include "ruby/version.h" |