diff options
author | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-30 00:16:26 +0000 |
---|---|---|
committer | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-30 00:16:26 +0000 |
commit | f1c8cdd12b99ec81442039587681c8780e848130 (patch) | |
tree | e0bac536ab4fa8274594bbfd338abe1943cc6983 | |
parent | a3e598f414a467aead3e0e3ec1d42fd0989514e6 (diff) |
merge revision(s) 33114:
* configure.in: fix a build failure on GNU Hurd.
Patch by Samuel Thibault <sthibault at debian dot org>. Thank you!
[Bug #5250] [ruby-core:39185]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33116 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | configure.in | 5 | ||||
-rw-r--r-- | version.h | 4 |
3 files changed, 13 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Tue Aug 30 09:16:17 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com> + + * configure.in: fix a build failure on GNU Hurd. + Patch by Samuel Thibault <sthibault at debian dot org>. Thank you! + [Bug #5250] [ruby-core:39185] + Sun Aug 28 15:38:17 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com> * backport r33106 from trunk. diff --git a/configure.in b/configure.in index 83e5d7683e..66f7a9c4db 100644 --- a/configure.in +++ b/configure.in @@ -945,6 +945,11 @@ AS_CASE(["$target_os"], AC_DEFINE(SIZEOF_STRUCT_DIRENT_TOO_SMALL, 1) LIBS="-lm $LIBS" ], +# GNU Hurd +[gnu*], [ + AC_DEFINE(SIZEOF_STRUCT_DIRENT_TOO_SMALL, 1) + LIBS="-lm $LIBS" + ], [nextstep*], [ ], [openstep*], [ ], [rhapsody*], [ ], @@ -1,10 +1,10 @@ #define RUBY_VERSION "1.9.3" #define RUBY_PATCHLEVEL -1 -#define RUBY_RELEASE_DATE "2011-08-28" +#define RUBY_RELEASE_DATE "2011-08-30" #define RUBY_RELEASE_YEAR 2011 #define RUBY_RELEASE_MONTH 8 -#define RUBY_RELEASE_DAY 28 +#define RUBY_RELEASE_DAY 30 #include "ruby/version.h" |