naruse	2015-01-19 12:01:12 +0900 (Mon, 19 Jan 2015)

  New Revision: 49329

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

  Log:
    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]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/configure.in
    branches/ruby_2_2/version.h
Index: ruby_2_2/configure.in
===================================================================
--- ruby_2_2/configure.in	(revision 49328)
+++ ruby_2_2/configure.in	(revision 49329)
@@ -3018,7 +3018,7 @@ if test "$with_dln_a_out" != yes; then https://github.com/ruby/ruby/blob/trunk/ruby_2_2/configure.in#L3018
 	  "-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])
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 49328)
+++ ruby_2_2/ChangeLog	(revision 49329)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Mon Jan 19 12:00:51 2015  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@r...>
 
 	* configure.in (RUBY_SETJMP_TYPE): Remove superfluous semicolon
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 49328)
+++ ruby_2_2/version.h	(revision 49329)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #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

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49306


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