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

* test/{dbm,gdbm}/test_{dbm,gdbm}.rb: shouldn't use host_os. use

Browse source 
target_os instead. reported by KOBAYASHI Yasuhiro [ruby-list:43225]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@11924 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2007-02-27 16:25:00 +00:00
parent 513420bdfc
commit 00a0b78f17
4 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Wed Feb 28 01:22:58 2007 NAKAMURA Usaku <usa@ruby-lang.org>
* test/{dbm,gdbm}/test_{dbm,gdbm}.rb: shouldn't use host_os. use
target_os instead. reported by KOBAYASHI Yasuhiro [ruby-list:43225]
Wed Feb 28 00:08:11 2007 URABE Shyouhei <shyouhei@ice.uec.ac.jp> Wed Feb 28 00:08:11 2007 URABE Shyouhei <shyouhei@ice.uec.ac.jp>
* mkconfig.rb (RbConfig): add CONFIG['PATCHLEVEL'] * mkconfig.rb (RbConfig): add CONFIG['PATCHLEVEL']

11
lib/mkmf.rb
View file

@ -265,7 +265,7 @@ ensure
log_src(src) log_src(src)
end end
def link_command(ldflags, opt="", libpath=$LIBPATH) def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH)
Config::expand(TRY_LINK.dup, Config::expand(TRY_LINK.dup,
CONFIG.merge('hdrdir' => $hdrdir.quote, CONFIG.merge('hdrdir' => $hdrdir.quote,
'src' => CONFTEST_C, 'src' => CONFTEST_C,
@ -289,7 +289,7 @@ def cpp_command(outfile, opt="")
CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote)) CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote))
end end
def libpathflag(libpath=$LIBPATH) def libpathflag(libpath=$DEFLIBPATH|$LIBPATH)
libpath.map{|x| libpath.map{|x|
(x == "$(topdir)" ? LIBPATHFLAG : LIBPATHFLAG+RPATHFLAG) % x.quote (x == "$(topdir)" ? LIBPATHFLAG : LIBPATHFLAG+RPATHFLAG) % x.quote
}.join }.join
@ -1142,7 +1142,7 @@ end
# #
def create_makefile(target, srcprefix = nil) def create_makefile(target, srcprefix = nil)
$target = target $target = target
libpath = $LIBPATH libpath = $DEFLIBPATH|$LIBPATH
message "creating Makefile\n" message "creating Makefile\n"
rm_f "conftest*" rm_f "conftest*"
if CONFIG["DLEXT"] == $OBJEXT if CONFIG["DLEXT"] == $OBJEXT
@ -1204,7 +1204,7 @@ def create_makefile(target, srcprefix = nil)
mfile = open("Makefile", "wb") mfile = open("Makefile", "wb")
mfile.print configuration(srcprefix) mfile.print configuration(srcprefix)
mfile.print " mfile.print "
libpath = #{$LIBPATH.join(" ")} libpath = #{($DEFLIBPATH|$LIBPATH).join(" ")}
LIBPATH = #{libpath} LIBPATH = #{libpath}
DEFFILE = #{deffile} DEFFILE = #{deffile}
@ -1424,7 +1424,8 @@ def init_mkmf(config = CONFIG)
$LIBRUBYARG = "" $LIBRUBYARG = ""
$LIBRUBYARG_STATIC = config['LIBRUBYARG_STATIC'] $LIBRUBYARG_STATIC = config['LIBRUBYARG_STATIC']
$LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED'] $LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED']
$LIBPATH = $extmk ? ["$(topdir)"] : CROSS_COMPILING ? [] : ["$(libdir)"] $DEFLIBPATH = $extmk ? ["$(topdir)"] : CROSS_COMPILING ? [] : ["$(libdir)"]
$LIBPATH = []
$INSTALLFILES = nil $INSTALLFILES = nil
$objs = nil $objs = nil

4
test/dbm/test_dbm.rb
View file

@ -12,7 +12,7 @@ if defined? DBM
class TestDBM < Test::Unit::TestCase class TestDBM < Test::Unit::TestCase
def TestDBM.uname_s def TestDBM.uname_s
require 'rbconfig' require 'rbconfig'
case Config::CONFIG['host_os'] case Config::CONFIG['target_os']
when 'cygwin' when 'cygwin'
require 'Win32API' require 'Win32API'
uname = Win32API.new('cygwin1', 'uname', 'P', 'I') uname = Win32API.new('cygwin1', 'uname', 'P', 'I')
@ -21,7 +21,7 @@ if defined? DBM
utsname.unpack('A20' * 5)[0] utsname.unpack('A20' * 5)[0]
else else
Config::CONFIG['host_os'] Config::CONFIG['target_os']
end end
end end
SYSTEM = uname_s SYSTEM = uname_s

4
test/gdbm/test_gdbm.rb
View file

@ -12,7 +12,7 @@ if defined? GDBM
class TestGDBM < Test::Unit::TestCase class TestGDBM < Test::Unit::TestCase
def TestGDBM.uname_s def TestGDBM.uname_s
require 'rbconfig' require 'rbconfig'
case Config::CONFIG['host_os'] case Config::CONFIG['target_os']
when 'cygwin' when 'cygwin'
require 'Win32API' require 'Win32API'
uname = Win32API.new('cygwin1', 'uname', 'P', 'I') uname = Win32API.new('cygwin1', 'uname', 'P', 'I')
@ -21,7 +21,7 @@ if defined? GDBM
utsname.unpack('A20' * 5)[0] utsname.unpack('A20' * 5)[0]
else else
Config::CONFIG['host_os'] Config::CONFIG['target_os']
end end
end end
SYSTEM = uname_s SYSTEM = uname_s