diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-19 03:29:29 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-19 03:29:29 +0000 |
commit | 95c3026f97831a41bdfb67484cc6d992241b43a7 (patch) | |
tree | 4b8d591d817071ee4a1f437b0bff16d2c4d566ec | |
parent | d8168dedeff4affc0bccd53ecb9d500280fa5d2d (diff) |
merge revision(s) 33327:
* configure.in: ignore all warnings from an arbitrary
header in /usr/local/include.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34690 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | version.h | 6 |
3 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Sun Feb 19 12:27:24 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in: ignore all warnings from an arbitrary + header in /usr/local/include. + Fri Feb 17 12:51:25 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/mkmf.rb (create_header): log the content of header. diff --git a/configure.in b/configure.in index d645aa781a..50174cec6a 100644 --- a/configure.in +++ b/configure.in @@ -2093,7 +2093,7 @@ if test "$with_dln_a_out" != yes; then # /usr/local/include is always searched for # some reason, but /usr/local/lib is not. hdr=`find /usr/local/include -name \*.h -type f | sed 's:^/usr/local/include/::;q'` - if test -n "$hdr" && $CC -E -include "$hdr" -xc /dev/null | fgrep -q "$hdr"; then + if test -n "$hdr" && $CC -E -include "$hdr" -xc /dev/null 2>/dev/null | fgrep -q "$hdr"; then $CC -print-search-dirs | grep -q '^libraries:.*:/usr/local/lib/*' || echo " $LDFLAGS " | grep -q ' -L */usr/local/lib/* ' || LDFLAGS="${LDFLAGS:+$LDFLAGS }-L/usr/local/lib" @@ -1,10 +1,10 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 133 +#define RUBY_PATCHLEVEL 134 -#define RUBY_RELEASE_DATE "2012-02-17" +#define RUBY_RELEASE_DATE "2012-02-19" #define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 17 +#define RUBY_RELEASE_DAY 19 #include "ruby/version.h" |