From 18d73ae8151ff259fe8e4aac8f228173dbe57924 Mon Sep 17 00:00:00 2001 From: usa Date: Wed, 18 Nov 2015 11:57:07 +0000 Subject: merge revision(s) 50104,50105: [Backport #10906] * ext/date/extconf.rb: try_cflags("-std=iso9899:1999") [Bug #10906] ruby itself (including numeric.c) is built with strict compile options including -std=iso9899:1999, but ext/date is not. By the way -std=iso9899:1999 is not only a warning option but also changes behavior like MACRO definitions for example INFINITY. gcc on Solaris affect this. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@52645 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 9 +++++++++ ext/date/extconf.rb | 3 +++ version.h | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d0a09a3890..16cac6f222 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Wed Nov 18 20:56:50 2015 NARUSE, Yui + + * ext/date/extconf.rb: try_cflags("-std=iso9899:1999") [Bug #10906] + ruby itself (including numeric.c) is built with strict compile + options including -std=iso9899:1999, but ext/date is not. + By the way -std=iso9899:1999 is not only a warning option but also + changes behavior like MACRO definitions for example INFINITY. + gcc on Solaris affect this. + Wed Nov 18 20:38:15 2015 Zachary Scott * ext/openssl/ossl_pkey.c: Merge ruby/openssl@b9ea8ef [Bug #10735] diff --git a/ext/date/extconf.rb b/ext/date/extconf.rb index 9f7d3e8f0b..6f479eaa26 100644 --- a/ext/date/extconf.rb +++ b/ext/date/extconf.rb @@ -1,2 +1,5 @@ require 'mkmf' +if try_cflags("-std=iso9899:1999") + $CFLAGS += " " << "-std=iso9899:1999" +end create_makefile('date_core') diff --git a/version.h b/version.h index c88c5863ba..a9c9cde83a 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.1.8" #define RUBY_RELEASE_DATE "2015-11-18" -#define RUBY_PATCHLEVEL 420 +#define RUBY_PATCHLEVEL 421 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 11 -- cgit v1.2.3