kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* common.mk (static-ruby): overridable.

Browse source 
* ext/extmk.rb (parse_args): force to link extensions statically only
  if static is given for extstatic.

* ext/extmk.rb (RUBY, RUBYW): overridable.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9550 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2005-11-16 14:25:53 +00:00
parent 45c7551c59
commit f3727f5928
3 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
Wed Nov 16 23:24:17 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (static-ruby): overridable.
* ext/extmk.rb (parse_args): force to link extensions statically only
if static is given for extstatic.
* ext/extmk.rb (RUBY, RUBYW): overridable.
Wed Nov 16 01:29:31 2005 Kouhei Sutou <kou@cozmixng.org> Wed Nov 16 01:29:31 2005 Kouhei Sutou <kou@cozmixng.org>
* lib/rss/trackback.rb: added TrackBack prefix. * lib/rss/trackback.rb: added TrackBack prefix.

6
common.mk
View file

@ -4,6 +4,8 @@ dll: $(LIBRUBY_SO);
RUBYOPT = RUBYOPT =
STATIC_RUBY = static-ruby
EXTCONF = extconf.rb EXTCONF = extconf.rb
RBCONFIG = ./.rbconfig.time RBCONFIG = ./.rbconfig.time
@ -77,9 +79,9 @@ $(LIBRUBY_A): $(OBJS) $(DMYEXT)
$(LIBRUBY_SO): $(OBJS) $(DLDOBJS) $(LIBRUBY_A) $(PREP) $(ARCHFILE) $(LIBRUBY_SO): $(OBJS) $(DLDOBJS) $(LIBRUBY_A) $(PREP) $(ARCHFILE)
static-ruby: $(MAINOBJ) $(EXTOBJS) $(LIBRUBY_A) $(STATIC_RUBY)$(EXEEXT): $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A)
@$(RM) $@ @$(RM) $@
$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBY_A) $(LIBS) $(OUTFLAG)$@ $(PURIFY) $(CC) $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)$@ $(LDFLAGS) $(XLDFLAGS)
ruby.imp: $(LIBRUBY_A) ruby.imp: $(LIBRUBY_A)
@$(NM) -Pgp $(LIBRUBY_A) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@ @$(NM) -Pgp $(LIBRUBY_A) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@

8
ext/extmk.rb
View file

@ -218,8 +218,7 @@ def parse_args()
if ($extstatic = v) == false if ($extstatic = v) == false
$extstatic = [] $extstatic = []
elsif v elsif v
$force_static = true $force_static = true if $extstatic.delete("static")
$extstatic.delete("static")
$extstatic = nil if $extstatic.empty? $extstatic = nil if $extstatic.empty?
end end
end end
@ -233,6 +232,7 @@ def parse_args()
$make = v || 'make' $make = v || 'make'
end end
opts.on('--make-flags=FLAGS', '--mflags', Shellwords) do |v| opts.on('--make-flags=FLAGS', '--mflags', Shellwords) do |v|
v.grep(/\A([-\w]+)=(.*)/) {$configure_args["--#{$1}"] = $2}
if arg = v.first if arg = v.first
arg.insert(0, '-') if /\A[^-][^=]*\Z/ =~ arg arg.insert(0, '-') if /\A[^-][^=]*\Z/ =~ arg
end end
@ -459,9 +459,11 @@ SRC
$mflags.concat(conf) $mflags.concat(conf)
end end
rubies = [] rubies = []
%w[RUBY RUBYW].each {|r| %w[RUBY RUBYW STATIC_RUBY].each {|r|
n = r
if r = arg_config("--"+r.downcase) || config_string(r+"_INSTALL_NAME") if r = arg_config("--"+r.downcase) || config_string(r+"_INSTALL_NAME")
rubies << r+EXEEXT rubies << r+EXEEXT
$mflags << "#{n}=#{r}"
end end
} }