kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) r48886: [Backport #10210]

Browse source 
* 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_1@49470 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2015-02-02 13:39:29 +00:00
parent 3fb0936a98
commit baa85be551
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Mon Feb 2 22:38:53 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* 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@ruby-lang.org>
* ext/openssl/ossl_cipher.c (ossl_cipher_update_long): update huge

4
configure.in
View file

@ -2620,8 +2620,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

2
version.h
View file

@ -1,6 +1,6 @@
#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