nagachika	2015-02-02 22:39:29 +0900 (Mon, 02 Feb 2015)

  New Revision: 49470

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=49470

  Log:
    merge revision(s) r48886: [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]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/configure.in
    branches/ruby_2_1/version.h
Index: ruby_2_1/configure.in
===================================================================
--- ruby_2_1/configure.in	(revision 49469)
+++ ruby_2_1/configure.in	(revision 49470)
@@ -2620,8 +2620,8 @@ AC_ARG_WITH(dln-a-out, https://github.com/ruby/ruby/blob/trunk/ruby_2_1/configure.in#L2620
 
 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
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 49469)
+++ ruby_2_1/ChangeLog	(revision 49470)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Mon Feb  2 22:38:53 2015  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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]
+
 Thu Jan 22 20:40:36 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/openssl/ossl_cipher.c (ossl_cipher_update_long): update huge
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 49469)
+++ ruby_2_1/version.h	(revision 49470)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.5"
 #define RUBY_RELEASE_DATE "2015-02-02"
-#define RUBY_PATCHLEVEL 286
+#define RUBY_PATCHLEVEL 287
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 2

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r48886


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/