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

depend: fix for static library on mswin

Browse source 
* enc/depend (ARFLAGS): VisualC++ linker does not allow spaces between
  output option and the output file name.  [Bug #7950]
* enc/depend (RANLIB): set default command to do nothing, or make the
  entire line a label on Windows.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39489 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-02-25 06:47:23 +00:00
parent 593ffbcf71
commit 72aee03262
3 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Mon Feb 25 15:47:18 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* enc/depend (ARFLAGS): VisualC++ linker does not allow spaces between
output option and the output file name. [Bug #7950]
* enc/depend (RANLIB): set default command to do nothing, or make the
entire line a label on Windows.
Mon Feb 25 14:41:07 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> Mon Feb 25 14:41:07 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (MakeMakefile#init_mkmf): default libdirname to libdir. * lib/mkmf.rb (MakeMakefile#init_mkmf): default libdirname to libdir.

1
enc/Makefile.in
View file

@ -35,6 +35,7 @@ LIBRUBYARG_STATIC = $(LIBRUBYARG_SHARED)
empty = empty =
AR = @AR@ AR = @AR@
CC = @CC@ CC = @CC@
ARFLAGS = @ARFLAGS@$(empty)
RANLIB = @RANLIB@ RANLIB = @RANLIB@
OUTFLAG = @OUTFLAG@$(empty) OUTFLAG = @OUTFLAG@$(empty)
COUTFLAG = @COUTFLAG@$(empty) COUTFLAG = @COUTFLAG@$(empty)

6
enc/depend
View file

@ -10,6 +10,8 @@
% rule_subst = CONFIG["RULE_SUBST"] || "%s" % rule_subst = CONFIG["RULE_SUBST"] || "%s"
% transvpath = rule_subst.dup.sub!(/\{[^{}]+\}/, '$(TRANSVPATH)/') || "enc/trans/%s" % transvpath = rule_subst.dup.sub!(/\{[^{}]+\}/, '$(TRANSVPATH)/') || "enc/trans/%s"
% transvpath_prefix = (rule_subst.dup.sub!(/\{[^{}]+\}/, '{$(TRANSVPATH)}') || "%s") % "" % transvpath_prefix = (rule_subst.dup.sub!(/\{[^{}]+\}/, '{$(TRANSVPATH)}') || "%s") % ""
% CONFIG['ARFLAGS'] = 'rcu ' if CONFIG['ARFLAGS'].empty?
% CONFIG['RANLIB'] = ':' if CONFIG['RANLIB'].empty?
% if File::ALT_SEPARATOR % if File::ALT_SEPARATOR
% pathrep = proc {|path| path.gsub('/', File::ALT_SEPARATOR).gsub(/\$\(([@<?*]\w?|\w+)\)/, "$(\\1:/=\\#{File::ALT_SEPARATOR})")} % pathrep = proc {|path| path.gsub('/', File::ALT_SEPARATOR).gsub(/\$\(([@<?*]\w?|\w+)\)/, "$(\\1:/=\\#{File::ALT_SEPARATOR})")}
% else % else
@ -63,12 +65,12 @@ libtrans: $(LIBTRANS)
$(LIBENC): $(ENCOBJS) $(LIBENC): $(ENCOBJS)
@$(RM) $@ @$(RM) $@
$(ECHO) linking statically-linked encoding library $@ $(ECHO) linking statically-linked encoding library $@
$(Q) $(AR) <%=CONFIG['ARFLAGS'] || 'rcu' %> $@ $(ENCOBJS) $(Q) $(AR) $(ARFLAGS)$@ $(ENCOBJS)
@-$(RANLIB) $@ 2> /dev/null || true @-$(RANLIB) $@ 2> /dev/null || true
$(LIBTRANS): $(TRANSOBJS) $(LIBTRANS): $(TRANSOBJS)
@$(RM) $@ @$(RM) $@
$(ECHO) linking statically-linked transcoder library $@ $(ECHO) linking statically-linked transcoder library $@
$(Q) $(AR) <%=CONFIG['ARFLAGS'] || 'rcu' %> $@ $(TRANSOBJS) $(Q) $(AR) $(ARFLAGS)$@ $(TRANSOBJS)
@-$(RANLIB) $@ 2> /dev/null || true @-$(RANLIB) $@ 2> /dev/null || true
srcs: $(TRANSCSRCS) srcs: $(TRANSCSRCS)