diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-08-19 05:59:10 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-08-19 05:59:10 +0000 |
| commit | 7a7e23932134de6b8ad00d12ecf8e6c28cb8abef (patch) | |
| tree | a77639dd26c9a0f121c7675b4e9ad5e84efa590e /ext/extmk.rb.in | |
| parent | 6fdf913475c9539335c605cba3422538049e1275 (diff) | |
* array.c (sort_2): *a - *b may overflow.
* array.c (rb_ary_new2): len*sizeof(VALUE) may be a positive value.
* array.c (rb_ary_initialize): ditto.
* re.c (rb_reg_initialize): should not modify frozen Regexp.
* bignum.c (rb_uint2big): there should be no zero sized bignum.
* ext/extmk.rb.in: extmake() that works properly for both tkutil
(tk/tkutil.so) and digest/sha1.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@2721 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/extmk.rb.in')
| -rw-r--r-- | ext/extmk.rb.in | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in index f0e8110656..e82e6abb27 100644 --- a/ext/extmk.rb.in +++ b/ext/extmk.rb.in @@ -631,7 +631,7 @@ def extmake(target) unless $install or $clean if $static_ext.size > 0 || !File.exist?("./Makefile") || - older("./Makefile", "#{$top_srcdir}/ext/@setup@") || + older("./Makefile", $setup) || older("./Makefile", "#{$topdir}/ext/extmk.rb") || older("./Makefile", "#{$top_srcdir}/ext/#{target}/makefile.rb") || older("./Makefile", "#{$top_srcdir}/ext/#{target}/extconf.rb") @@ -649,7 +649,7 @@ def extmake(target) $static = $target if $static if File.exist?("./Makefile") if $static - $extlist.push [$static, File.basename($target)] + $extlist.push [$static, $target, File.basename($target)] end if $install system "#{$make} install DESTDIR=#{$destdir}" @@ -695,6 +695,7 @@ for setup in ["@setup@", "#{$top_srcdir}/ext/@setup@"] target = target.downcase if /mswin32/ =~ RUBY_PLATFORM $static_ext[target] = true end + $setup = setup f.close break end @@ -731,13 +732,13 @@ miniruby = "miniruby@EXEEXT@" $extobjs = "" unless $extobjs if $extlist.size > 0 - for s,t in $extlist - f = format("%s/%s.%s", s, t, $LIBEXT) + for s,t,i in $extlist + f = format("%s/%s.%s", s, i, $LIBEXT) if File.exist?(f) $extinit += format("\ \tInit_%s();\n\ \trb_provide(\"%s.so\");\n\ -", t, s) +", i, t) $extobjs += "ext/" $extobjs += f $extobjs += " " @@ -746,7 +747,7 @@ if $extlist.size > 0 end end - if older("extinit.c", "#{$top_srcdir}/ext/@setup@") + if older("extinit.c", $setup) || older("extinit.c", "#{$topdir}/ext/extmk.rb") f = open("extinit.c", "w") f.printf "void Init_ext() {\n" f.printf $extinit @@ -761,7 +762,7 @@ if $extlist.size > 0 Dir.chdir ".." - if older(ruby, "#{$top_srcdir}/ext/@setup@") or older(ruby, miniruby) + if older(ruby, $setup) or older(ruby, miniruby) rm_f ruby end |