diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-12-30 16:58:51 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-12-30 16:58:51 +0000 |
| commit | 1e19008db445a87f36091ca60662cbaacdd198f9 (patch) | |
| tree | a9ae9d076b01f231ad5b9720aa863360b353b2ef | |
| parent | a85a5beac0a310f31f4401efd2886f7d4c94df2a (diff) | |
| download | ruby-1e19008db445a87f36091ca60662cbaacdd198f9.tar.gz ruby-1e19008db445a87f36091ca60662cbaacdd198f9.tar.xz ruby-1e19008db445a87f36091ca60662cbaacdd198f9.zip | |
* ext/extmk.rb: fix for extstatic.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@26205 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ext/extmk.rb | 12 | ||||
| -rw-r--r-- | version.h | 4 |
3 files changed, 13 insertions, 7 deletions
@@ -1,3 +1,7 @@ +Thu Dec 31 01:58:47 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/extmk.rb: fix for extstatic. + Wed Dec 30 19:43:00 2009 NARUSE, Yui <naruse@ruby-lang.org> * include/ruby/ruby.h (RREGEXP_SRC_END): added. diff --git a/ext/extmk.rb b/ext/extmk.rb index a94bbfc44..13812fc8b 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -69,8 +69,10 @@ def extract_makefile(makefile, keep = true) end $target = target $extconf_h = m[/^RUBY_EXTCONF_H[ \t]*=[ \t]*(\S+)/, 1] - $static ||= m[/^EXTSTATIC[ \t]*=[ \t]*(\S+)/, 1] || false - /^STATIC_LIB[ \t]*=[ \t]*\S+/ =~ m or $static = nil + if $static.nil? + $static ||= m[/^EXTSTATIC[ \t]*=[ \t]*(\S+)/, 1] || false + /^STATIC_LIB[ \t]*=[ \t]*\S+/ =~ m or $static = false + end $preload = Shellwords.shellwords(m[/^preload[ \t]*=[ \t]*(.*)/, 1] || "") $DLDFLAGS += " " + (m[/^dldflags[ \t]*=[ \t]*(.*)/, 1] || "") if s = m[/^LIBS[ \t]*=[ \t]*(.*)/, 1] @@ -439,7 +441,7 @@ Dir::chdir('ext') hdrdir = $hdrdir $hdrdir = ($top_srcdir = relative_from(srcdir, $topdir = "..")) + "/include" exts.each do |d| - $static = $force_static ? $static_ext[target] : false + $static = $force_static ? $static_ext[target] : nil if $ignore or !$nodynamic or $static extmake(d) or abort @@ -491,7 +493,7 @@ unless $extlist.empty? end next end - f = format("%s/%s.%s", s, i, $LIBEXT) + f = format("%s/%s.%s", t, i, $LIBEXT) if File.exist?(f) $extinit << " init(Init_#{i}, \"#{t}.so\");\n" $extobjs << "ext/#{f} " @@ -570,7 +572,7 @@ $mflags.unshift("topdir=#$topdir") ENV.delete("RUBYOPT") if $command_output message = "echo #{message}" - cmd = $makeflags.join(' ') + cmd = $makeflags.map {|s|s.sub(/.*[$(){};\s].*/, %q['\&'])}.join(' ') open($command_output, 'wb') do |f| case $command_output when /\.sh\z/ @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_RELEASE_DATE "2009-12-30" +#define RUBY_RELEASE_DATE "2009-12-31" #define RUBY_PATCHLEVEL -1 #define RUBY_BRANCH_NAME "trunk" @@ -8,7 +8,7 @@ #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 30 +#define RUBY_RELEASE_DAY 31 #include "ruby/version.h" |