nagachika	2016-05-15 02:46:54 +0900 (Sun, 15 May 2016)

  New Revision: 55001

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

  Log:
    merge revision(s) 54999: [Backport #12379]
    
    * lib/mkmf.rb (pkg_config): use xsystem consistently to set up
      library path environment variable as well as latter pkg-config
      calls.  [ruby-dev:49619] [Bug #12379]

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/lib/mkmf.rb
    branches/ruby_2_3/version.h
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 55000)
+++ ruby_2_3/ChangeLog	(revision 55001)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Sun May 15 02:33:52 2016  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (pkg_config): use xsystem consistently to set up
+	  library path environment variable as well as latter pkg-config
+	  calls.  [ruby-dev:49619] [Bug #12379]
+
 Fri May  6 02:30:32 2016  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/optparse.rb: [DOC] fix example code.  base on the code by
Index: ruby_2_3/lib/mkmf.rb
===================================================================
--- ruby_2_3/lib/mkmf.rb	(revision 55000)
+++ ruby_2_3/lib/mkmf.rb	(revision 55001)
@@ -1787,7 +1787,7 @@ SRC https://github.com/ruby/ruby/blob/trunk/ruby_2_3/lib/mkmf.rb#L1787
     elsif ($PKGCONFIG ||=
            (pkgconfig = with_config("pkg-config", ("pkg-config" unless CROSS_COMPILING))) &&
            find_executable0(pkgconfig) && pkgconfig) and
-        system("#{$PKGCONFIG} --exists #{pkg}")
+        xsystem("#{$PKGCONFIG} --exists #{pkg}")
       # default to pkg-config command
       pkgconfig = $PKGCONFIG
       get = proc {|opt|
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 55000)
+++ ruby_2_3/version.h	(revision 55001)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.2"
-#define RUBY_RELEASE_DATE "2016-05-06"
-#define RUBY_PATCHLEVEL 118
+#define RUBY_RELEASE_DATE "2016-05-15"
+#define RUBY_PATCHLEVEL 119
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 6
+#define RUBY_RELEASE_DAY 15
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r54999


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