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

3 files changed, 8 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 50e05b7f55..7fe05e8cea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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])
diff --git a/version.h b/version.h
index ee12f7bcf4..b41ac5938e 100644
--- a/version.h
+++ b/version.h
@@ -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