[ruby-dev:27670] Re: patch for Makefile.in

なかだです。

At Thu, 10 Nov 2005 14:38:50 +0900,
Takahiro Kambe wrote in [ruby-dev:27669]:
> > のmakeはMakefileに
> >   OUTFLAG = -o 
> > のように末尾に空白があっても無視されてしまうんでしょうか？
> Darwinと言っても、pkgsrcの話なので、NetBSD互換のmakeが使われています。
> そして、どうやら4.4BSD以降のmake(pmake)ではそうなるようです。以下で 
> test.mk の最初の行のc の最後にスペースがあります。

うーん、厄介な。


Index: Makefile.in
===================================================================
RCS file: /cvs/ruby/src/ruby/Makefile.in,v
retrieving revision 1.75
diff -U2 -p -r1.75 Makefile.in
--- Makefile.in	6 Sep 2005 23:22:34 -0000	1.75
+++ Makefile.in	10 Nov 2005 05:58:11 -0000
@@ -31,5 +31,6 @@ EXTOUT = @EXTOUT@
 RIDATADIR = $(DESTDIR)$(datadir)/ri/$(MAJOR).$(MINOR)/system
 
-OUTFLAG = -o 
+OUTFLAG_SPACE = @OUTFLAG_SPACE@
+OUTFLAG = @OUTFLAG@
 CFLAGS = @CFLAGS@ @XCFLAGS@ @ARCH_FLAG@
 CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@
Index: configure.in
===================================================================
RCS file: /cvs/ruby/src/ruby/configure.in,v
retrieving revision 1.289
diff -U2 -p -r1.289 configure.in
--- configure.in	5 Nov 2005 04:43:44 -0000	1.289
+++ configure.in	10 Nov 2005 06:28:11 -0000
@@ -154,5 +154,6 @@ RUBY_PROG_GNU_LD
 RUBY_CPPOUTFILE
 
-: ${OUTFLAG='-o '}
+: ${OUTFLAG='$(OUTFLAG_SPACE:.= )'} ${OUTFLAG_SPACE='-o.'}
+AC_SUBST(OUTFLAG_SPACE)
 AC_SUBST(OUTFLAG)
 
Index: mkconfig.rb
===================================================================
RCS file: /cvs/ruby/src/ruby/mkconfig.rb,v
retrieving revision 1.41
diff -U2 -p -r1.41 mkconfig.rb
--- mkconfig.rb	18 Oct 2005 01:18:05 -0000	1.41
+++ mkconfig.rb	10 Nov 2005 07:09:16 -0000
@@ -121,8 +121,11 @@ print <<EOS
       if !(v = $1 || $2)
 	'$'
-      elsif key = config[v]
+      elsif key = config[v = v[/\\A(\\w+)(?::(.*?)=(.*))?\\z/, 1]]
+	pat, sub = $2, $3
 	config[v] = false
 	Config::expand(key, config)
 	config[v] = key
+	key << sub if pat and (key = key.dup).chomp!(pat)
+	key
       else
 	var
Index: lib/mkmf.rb
===================================================================
RCS file: /cvs/ruby/src/ruby/lib/mkmf.rb,v
retrieving revision 1.233
diff -U2 -p -r1.233 mkmf.rb
--- lib/mkmf.rb	22 Oct 2005 14:54:53 -0000	1.233
+++ lib/mkmf.rb	10 Nov 2005 06:33:31 -0000
@@ -122,5 +122,5 @@ else
 end
 
-OUTFLAG = CONFIG['OUTFLAG']
+OUTFLAG = Config::CONFIG['OUTFLAG']
 CPPOUTFILE = CONFIG['CPPOUTFILE']
 


-- 
--- 僕の前にBugはない。
--- 僕の後ろにBugはできる。
    中田 伸悦