1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* lib/mkmf.rb (create_makefile): allow putting spaces between target

Browse Source 
and colon in depend file.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8074 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2005-03-05 03:52:21 +00:00
parent 1117412bcc
commit 4783944876
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sat Mar 5 12:52:08 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (create_makefile): allow putting spaces between target
and colon in depend file.
Sat Mar 5 02:41:00 2005 NAKAMURA Usaku <usa@ruby-lang.org> Sat Mar 5 02:41:00 2005 NAKAMURA Usaku <usa@ruby-lang.org>
* file.c (eaccess): workaround for VC++8 runtime. * file.c (eaccess): workaround for VC++8 runtime.

1
eval.c
View File

@ -4633,6 +4633,7 @@ break_jump(retval)
static VALUE bmcall _((VALUE, VALUE)); static VALUE bmcall _((VALUE, VALUE));
static int method_arity _((VALUE)); static int method_arity _((VALUE));
/*:nodoc:*/
static VALUE static VALUE
rb_yield_0(val, self, klass, flags, avalue) rb_yield_0(val, self, klass, flags, avalue)
VALUE val, self, klass; /* OK */ VALUE val, self, klass; /* OK */

6
lib/mkmf.rb
View File

@ -1096,11 +1096,11 @@ site-install-rb: install-rb
impconv[] impconv[]
end end
end end
if /\A\.(\w+)\.(\w+)(?:\s*:)/ =~ line if m = /\A\.(\w+)\.(\w+)(?:\s*:)/.match(line)
implicit = [[$1, $2], [$']] implicit = [[m[1], m[2]], [m.post_match]]
next next
elsif RULE_SUBST and /\A[$\w][^#]*:/ =~ line elsif RULE_SUBST and /\A[$\w][^#]*:/ =~ line
line.gsub!(%r"(?<=\A|\s)(?!\.)([^$(){}+=:\s\/\\,]+)(?=\s|\z)") {|*m| RULE_SUBST % m} line.gsub!(%r"(?<=\s)(?!\.)([^$(){}+=:\s\/\\,]+)(?=\s|\z)") {|*m| RULE_SUBST % m}
end end
mfile.print line mfile.print line
end end

2
wince/Makefile.sub
View File

@ -194,7 +194,7 @@ BANG = !
!include config.h !include config.h
!endif !endif
$(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(CONFIG_H): $(MKFILES) $(srcdir)/wince/Makefile.sub
@echo Creating config.h @echo Creating config.h
@$(srcdir:/=\)\win32\ifchange.bat config.h << @$(srcdir:/=\)\win32\ifchange.bat config.h <<
#define STDC_HEADERS 1 #define STDC_HEADERS 1