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

mkmf.rb: use expanded values

Browse source 
* lib/mkmf.rb: should use expanded values for header directories
  unless extmk.  patch by vo.x (Vit Ondruch) at [ruby-core:55653]
  [Bug #8115], rhbz#921650.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41648 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-06-26 07:42:13 +00:00
parent 86b65861cd
commit 70658c387d
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Wed Jun 26 16:42:11 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb: should use expanded values for header directories
unless extmk. patch by vo.x (Vit Ondruch) at [ruby-core:55653]
[Bug #8115], rhbz#921650.
Wed Jun 26 12:48:22 2013 Tanaka Akira <akr@fsij.org> Wed Jun 26 12:48:22 2013 Tanaka Akira <akr@fsij.org>
* bignum.c (bigxor_int): Fix a buffer over read. * bignum.c (bigxor_int): Fix a buffer over read.

5
lib/mkmf.rb
View file

@ -235,11 +235,10 @@ module MakeMakefile
path = dir path = dir
end end
$extmk ||= false $extmk ||= false
if not $extmk and File.exist?(RbConfig::CONFIG["rubyhdrdir"] + "/ruby/ruby.h") if not $extmk and File.exist?(($hdrdir = RbConfig::CONFIG["rubyhdrdir"]) + "/ruby/ruby.h")
$hdrdir = CONFIG["rubyhdrdir"]
$topdir = $hdrdir $topdir = $hdrdir
$top_srcdir = $hdrdir $top_srcdir = $hdrdir
$arch_hdrdir = CONFIG["rubyarchhdrdir"] $arch_hdrdir = RbConfig::CONFIG["rubyarchhdrdir"]
elsif File.exist?(($hdrdir = ($top_srcdir ||= topdir) + "/include") + "/ruby.h") elsif File.exist?(($hdrdir = ($top_srcdir ||= topdir) + "/include") + "/ruby.h")
$topdir ||= RbConfig::CONFIG["topdir"] $topdir ||= RbConfig::CONFIG["topdir"]
$arch_hdrdir = "$(extout)/include/$(arch)" $arch_hdrdir = "$(extout)/include/$(arch)"