kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 54999: [Backport #12379]

Browse source 
* 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
This commit is contained in:
nagachika 2016-05-14 17:46:54 +00:00
parent f8e604c69d
commit 97888037f1
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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

2
lib/mkmf.rb
View file

@ -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|

6
version.h
View file

@ -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"