diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-19 03:01:12 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-19 03:01:12 +0000 |
commit | e8e1a374f0a876a738027f5aaabba85b21a6538a (patch) | |
tree | aa4ab4c5a9224ec83f3383af14dbb611e6aecbfd | |
parent | b55129c3c544e37cf8d21e9f5c4ffdcb9b71eb73 (diff) |
merge revision(s) 49306: [Backport #10750]
* configure.in: get rid of pattern substitution, which is not
supported by ash, and ash on NetBSD parses whole source first
and fails to start. [ruby-dev:48823] [Bug #10750]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49329 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Mon Jan 19 12:00:51 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in: get rid of pattern substitution, which is not + supported by ash, and ash on NetBSD parses whole source first + and fails to start. [ruby-dev:48823] [Bug #10750] + Mon Jan 19 11:57:14 2015 Vit Ondruch <vondruch@redhat.com> * configure.in (RUBY_SETJMP_TYPE): Remove superfluous semicolon diff --git a/configure.in b/configure.in index 599a22ee2e..b3deed24fe 100644 --- a/configure.in +++ b/configure.in @@ -3018,7 +3018,7 @@ if test "$with_dln_a_out" != yes; then "-undefined dynamic_lookup" \ "-multiply_defined suppress" \ ; do - test "x${linker_flag}" = x || flag="${linker_flag}${flag// /,}" + test "x${linker_flag}" = x || flag="${linker_flag}`echo ${flag} | tr ' ' ,`" RUBY_TRY_LDFLAGS([$flag], [], [flag=]) if test "x$flag" != x; then RUBY_APPEND_OPTIONS(DLDFLAGS, [$flag]) @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.0" #define RUBY_RELEASE_DATE "2015-01-19" -#define RUBY_PATCHLEVEL 29 +#define RUBY_PATCHLEVEL 30 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 1 |