diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-05-14 17:46:54 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-05-14 17:46:54 +0000 |
| commit | 97888037f11ad81ae8c45fbc64449cb460bad026 (patch) | |
| tree | c9168004f77b14aa6482cd4c1f1d586aaf91fffd | |
| parent | f8e604c69d26b4f4f8a5d57d447b251e6b7bb3f0 (diff) | |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@55001 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/mkmf.rb | 2 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 10 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Sun May 15 02:33:52 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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@ruby-lang.org> * lib/optparse.rb: [DOC] fix example code. base on the code by diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 3c944eecf5..3181b058ab 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1787,7 +1787,7 @@ SRC 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| @@ -1,10 +1,10 @@ #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" |