From 1c65dd9b82c9663e1838f8791a47a5044d37ad41 Mon Sep 17 00:00:00 2001 From: usa Date: Wed, 14 Jan 2015 07:15:00 +0000 Subject: merge revision(s) 48886: [Backport #10210] * configure.in (rb_cv_binary_elf): get rid of -e option of cat which is not available on BusyBox, use tr instead. [ruby-core:64824] [Bug #10210] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49248 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ configure.in | 4 ++-- version.h | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index abfd7097ac..c9f45d709c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Jan 14 16:14:50 2015 Nobuyoshi Nakada + + * configure.in (rb_cv_binary_elf): get rid of -e option of cat + which is not available on BusyBox, use tr instead. + [ruby-core:64824] [Bug #10210] + Wed Jan 14 16:07:11 2015 NAKAMURA Usaku * signal.c (ruby_signal): since SIGKILL is not supported by MSVCRT, diff --git a/configure.in b/configure.in index 839c20c6eb..3c6ce92f81 100644 --- a/configure.in +++ b/configure.in @@ -2245,8 +2245,8 @@ AC_ARG_WITH(dln-a-out, AC_CACHE_CHECK(whether ELF binaries are produced, rb_cv_binary_elf, [AC_TRY_LINK([],[], [ -AS_CASE(["`head -1 conftest$EXEEXT | cat -e`"], -['^?ELF'*], [rb_cv_binary_elf=yes], [rb_cv_binary_elf=no])], +AS_CASE(["`head -1 conftest$EXEEXT | tr -dc '\177ELF' | tr '\177' .`"], +[.ELF*], [rb_cv_binary_elf=yes], [rb_cv_binary_elf=no])], rb_cv_binary_elf=no)]) if test "$rb_cv_binary_elf" = yes; then diff --git a/version.h b/version.h index 490662ac56..a8fee734b5 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2015-01-14" -#define RUBY_PATCHLEVEL 609 +#define RUBY_PATCHLEVEL 610 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 1 -- cgit v1.2.3