ruby-changes:2550
From: ko1@a...
Date: 28 Nov 2007 14:43:50 +0900
Subject: [ruby-changes:2550] nobu - Ruby:r14041 (ruby_1_8, trunk): * ext/extmk.rb (extract_makefile): use dldflags instead of DLDFLAGS to
nobu 2007-11-28 14:43:17 +0900 (Wed, 28 Nov 2007) New Revision: 14041 Modified files: branches/ruby_1_8/ChangeLog branches/ruby_1_8/ext/extmk.rb branches/ruby_1_8/lib/mkmf.rb trunk/ChangeLog trunk/ext/extmk.rb trunk/lib/mkmf.rb Log: * ext/extmk.rb (extract_makefile): use dldflags instead of DLDFLAGS to get rid of mixing $LDFLAGS and $ARCH_FLAG. * lib/mkmf.rb (configuration): ditto. * lib/mkmf.rb (create_makefile): support for extensions which has no shared object. http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/lib/mkmf.rb?r1=14041&r2=14040 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ext/extmk.rb?r1=14041&r2=14040 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=14041&r2=14040 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14041&r2=14040 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/mkmf.rb?r1=14041&r2=14040 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ext/extmk.rb?r1=14041&r2=14040 Index: ChangeLog =================================================================== --- ChangeLog (revision 14040) +++ ChangeLog (revision 14041) @@ -1,3 +1,13 @@ +Wed Nov 28 14:43:14 2007 Nobuyoshi Nakada <nobu@r...> + + * ext/extmk.rb (extract_makefile): use dldflags instead of DLDFLAGS to + get rid of mixing $LDFLAGS and $ARCH_FLAG. + + * lib/mkmf.rb (configuration): ditto. + + * lib/mkmf.rb (create_makefile): support for extensions which has no + shared object. + Wed Nov 28 02:42:10 2007 Nobuyoshi Nakada <nobu@r...> * bignum.c (big2str_find_n1): removed extraneous element. Index: lib/mkmf.rb =================================================================== --- lib/mkmf.rb (revision 14040) +++ lib/mkmf.rb (revision 14041) @@ -1208,7 +1208,10 @@ DEFS = #{CONFIG['DEFS']} CPPFLAGS = #{extconf_h}#{$CPPFLAGS} CXXFLAGS = $(CFLAGS) #{CONFIG['CXXFLAGS']} -DLDFLAGS = #$LDFLAGS #$DLDFLAGS #$ARCH_FLAG +ldflags = #{$LDFLAGS} +dldflags = #{$DLDFLAGS} +archflag = #{$ARCH_FLAG} +DLDFLAGS = $(ldflags) $(dldflags) $(archflag) LDSHARED = #{CONFIG['LDSHARED']} LDSHAREDXX = #{config_string('LDSHAREDXX') || '$(LDSHARED)'} AR = #{CONFIG['AR']} @@ -1405,11 +1408,11 @@ dirs = [] mfile.print "install: install-so install-rb\n\n" sodir = (dir = "$(RUBYARCHDIR)").dup - mfile.print("install-so: #{dir}\n") + mfile.print("install-so: ") if target f = "$(DLLIB)" dest = "#{dir}/#{f}" - mfile.print "install-so: #{dest}\n" + mfile.puts dir, "install-so: #{dest}" unless $extout mfile.print "#{dest}: #{f}\n" if (sep = config_string('BUILD_FILE_SEPARATOR')) @@ -1426,6 +1429,8 @@ mfile.print "\t@echo #{dir}/#{File.basename(f)}>>$(INSTALLED_LIST)\n" end end + else + mfile.puts "Makefile" end mfile.print("install-rb: pre-install-rb install-rb-default\n") mfile.print("install-rb-default: pre-install-rb-default\n") Index: ext/extmk.rb =================================================================== --- ext/extmk.rb (revision 14040) +++ ext/extmk.rb (revision 14041) @@ -79,7 +79,7 @@ $static ||= m[/^EXTSTATIC[ \t]*=[ \t]*(\S+)/, 1] || false /^STATIC_LIB[ \t]*=[ \t]*\S+/ =~ m or $static = nil $preload = Shellwords.shellwords(m[/^preload[ \t]*=[ \t]*(.*)/, 1] || "") - $DLDFLAGS += " " + (m[/^DLDFLAGS[ \t]*=[ \t]*(.*)/, 1] || "") + $DLDFLAGS += " " + (m[/^dldflags[ \t]*=[ \t]*(.*)/, 1] || "") if s = m[/^LIBS[ \t]*=[ \t]*(.*)/, 1] s.sub!(/^#{Regexp.quote($LIBRUBYARG)} */, "") s.sub!(/ *#{Regexp.quote($LIBS)}$/, "") Index: ruby_1_8/ext/extmk.rb =================================================================== --- ruby_1_8/ext/extmk.rb (revision 14040) +++ ruby_1_8/ext/extmk.rb (revision 14041) @@ -79,7 +79,7 @@ $static ||= m[/^EXTSTATIC[ \t]*=[ \t]*(\S+)/, 1] || false /^STATIC_LIB[ \t]*=[ \t]*\S+/ =~ m or $static = nil $preload = Shellwords.shellwords(m[/^preload[ \t]*=[ \t]*(.*)/, 1] || "") - $DLDFLAGS += " " + (m[/^DLDFLAGS[ \t]*=[ \t]*(.*)/, 1] || "") + $DLDFLAGS += " " + (m[/^dldflags[ \t]*=[ \t]*(.*)/, 1] || "") if s = m[/^LIBS[ \t]*=[ \t]*(.*)/, 1] s.sub!(/^#{Regexp.quote($LIBRUBYARG)} */, "") s.sub!(/ *#{Regexp.quote($LIBS)}$/, "") Index: ruby_1_8/ChangeLog =================================================================== --- ruby_1_8/ChangeLog (revision 14040) +++ ruby_1_8/ChangeLog (revision 14041) @@ -1,3 +1,13 @@ +Wed Nov 28 14:43:14 2007 Nobuyoshi Nakada <nobu@r...> + + * ext/extmk.rb (extract_makefile): use dldflags instead of DLDFLAGS to + get rid of mixing $LDFLAGS and $ARCH_FLAG. + + * lib/mkmf.rb (configuration): ditto. + + * lib/mkmf.rb (create_makefile): support for extensions which has no + shared object. + Wed Nov 28 09:51:42 2007 Nobuyoshi Nakada <nobu@r...> * bignum.c (rb_big2str0): do not clobber space for sign. Index: ruby_1_8/lib/mkmf.rb =================================================================== --- ruby_1_8/lib/mkmf.rb (revision 14040) +++ ruby_1_8/lib/mkmf.rb (revision 14041) @@ -1162,7 +1162,10 @@ DEFS = #{CONFIG['DEFS']} CPPFLAGS = #{extconf_h}#{$CPPFLAGS} CXXFLAGS = $(CFLAGS) #{CONFIG['CXXFLAGS']} -DLDFLAGS = #$LDFLAGS #$DLDFLAGS #$ARCH_FLAG +ldflags = #{$LDFLAGS} +dldflags = #{$DLDFLAGS} +archflag = #{$ARCH_FLAG} +DLDFLAGS = $(ldflags) $(dldflags) $(archflag) LDSHARED = #{CONFIG['LDSHARED']} AR = #{CONFIG['AR']} EXEEXT = #{CONFIG['EXEEXT']} @@ -1353,11 +1356,11 @@ dirs = [] mfile.print "install: install-so install-rb\n\n" sodir = (dir = "$(RUBYARCHDIR)").dup - mfile.print("install-so: #{dir}\n") + mfile.print("install-so: ") if target f = "$(DLLIB)" dest = "#{dir}/#{f}" - mfile.print "install-so: #{dest}\n" + mfile.puts dir, "install-so: #{dest}" unless $extout mfile.print "#{dest}: #{f}\n" if (sep = config_string('BUILD_FILE_SEPARATOR')) @@ -1374,6 +1377,8 @@ mfile.print "\t@echo #{dir}/#{File.basename(f)}>>$(INSTALLED_LIST)\n" end end + else + mfile.puts "Makefile" end mfile.print("install-rb: pre-install-rb install-rb-default\n") mfile.print("install-rb-default: pre-install-rb-default\n") -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml