diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-02 13:39:29 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-02 13:39:29 +0000 |
| commit | baa85be5519976b13c2bf1cc295bea0623165aa6 (patch) | |
| tree | ac77a0e88def2d342fb332546fa2ece9ff8bf919 | |
| parent | 3fb0936a985d6aa56ce73025572ad06aa5f337e8 (diff) | |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49470 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Mon Feb 2 22:38:53 2015 Nobuyoshi Nakada <[email protected]> + + * 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 <[email protected]> * ext/openssl/ossl_cipher.c (ossl_cipher_update_long): update huge diff --git a/configure.in b/configure.in index 6f8d9072e7..cc8849eb45 100644 --- a/configure.in +++ b/configure.in @@ -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 @@ -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 |