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

enc/Makefile.in: TARGET_NAME TARGET_ENTRY

Browse source 
* enc/Makefile.in (TARGET_NAME, TARGET_ENTRY): needed for EXTDLDFLAGS
  on some platforms.  [ruby-core:46600] [Bug #6768]
* enc/depend: no longer needs tweaking DLDFLAGS for TARGET names.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36502 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-07-23 14:58:42 +00:00
parent bec666ce78
commit fbee46fe66
4 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Mon Jul 23 23:58:40 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* enc/Makefile.in (TARGET_NAME, TARGET_ENTRY): needed for EXTDLDFLAGS
on some platforms. [ruby-core:46600] [Bug #6768]
* enc/depend: no longer needs tweaking DLDFLAGS for TARGET names.
Mon Jul 23 22:48:19 2012 Tanaka Akira <akr@fsij.org> Mon Jul 23 22:48:19 2012 Tanaka Akira <akr@fsij.org>
* lib/open-uri.rb: use respond_to? to test Tempfile. * lib/open-uri.rb: use respond_to? to test Tempfile.

6
enc/Makefile.in
View file

@ -51,9 +51,13 @@ LDFLAGS = @LDFLAGS@
LDSHARED = @LDSHARED@ LDSHARED = @LDSHARED@
ldflags = $(LDFLAGS) ldflags = $(LDFLAGS)
dldflags = @DLDFLAGS@ dldflags = @DLDFLAGS@
extdldflags = @EXTDLDFLAGS@
archflag = @ARCH_FLAG@ archflag = @ARCH_FLAG@
DLDFLAGS = $(ldflags) $(dldflags) $(archflag) DLDFLAGS = $(ldflags) $(dldflags) $(extdldflags) $(archflag)
RUBY = $(MINIRUBY) RUBY = $(MINIRUBY)
TARGET_NAME_ = $(@F) # BSD make seems unable to deal with @F with substitution
TARGET_NAME = $(TARGET_NAME_:.@DLEXT@=)
TARGET_ENTRY = @EXPORT_PREFIX@Init_$(TARGET_NAME)
WORKDIRS = @WORKDIRS@ WORKDIRS = @WORKDIRS@

3
enc/depend
View file

@ -1,8 +1,6 @@
% inplace = File.identical?($srcdir, ".") % inplace = File.identical?($srcdir, ".")
% workdirs = %w"$(ENCSODIR) $(TRANSSODIR) enc enc/trans" % workdirs = %w"$(ENCSODIR) $(TRANSSODIR) enc enc/trans"
% CONFIG["WORKDIRS"] = workdirs.join(' ') % CONFIG["WORKDIRS"] = workdirs.join(' ')
% CONFIG["DLDFLAGS"].sub!(/(\A|\s)(-\S+(?:\s*\w*)?\$\(TARGET\)\S*)/, '\1')
% dldflags = $2
% enable_shared = CONFIG['ENABLE_SHARED'] == 'yes' % enable_shared = CONFIG['ENABLE_SHARED'] == 'yes'
% deffile = (true if /\$\(DEFFILE\)/ =~ CONFIG["LINK_SO"]) % deffile = (true if /\$\(DEFFILE\)/ =~ CONFIG["LINK_SO"])
% dependencies = ENCS + TRANS % dependencies = ENCS + TRANS
@ -115,7 +113,6 @@ $(TRANSOBJS): ruby.h intern.h config.h defines.h missing.h encoding.h oniguruma.
$(ECHO) linking <%=mesg%> $(@F) $(ECHO) linking <%=mesg%> $(@F)
% cmd = link_so.sub(/\$\(OBJS\)/) {obj} % cmd = link_so.sub(/\$\(OBJS\)/) {obj}
% base = File.basename(e) % base = File.basename(e)
% cmd.sub!(/(?=\$\(DLDFLAGS\))/) {dldflags.sub(/\$\(TARGET\)/) {base} + " "} if dldflags
% if df % if df
$(Q)echo> <%=df%> EXPORTS $(Q)echo> <%=df%> EXPORTS
$(Q)echo>> <%=df%> <%=EXPORT_PREFIX%>Init_<%=base%> $(Q)echo>> <%=df%> <%=EXPORT_PREFIX%>Init_<%=base%>

1
win32/Makefile.sub
View file

@ -777,6 +777,7 @@ s,@OBJEXT@,$(OBJEXT),;t t
s,@XCFLAGS@,$(XCFLAGS),;t t s,@XCFLAGS@,$(XCFLAGS),;t t
s,@XLDFLAGS@,$(XLDFLAGS),;t t s,@XLDFLAGS@,$(XLDFLAGS),;t t
s,@DLDFLAGS@,$(DLDFLAGS) $$(LIBPATH),;t t s,@DLDFLAGS@,$(DLDFLAGS) $$(LIBPATH),;t t
s,@EXTDLDFLAGS@,$(EXTDLDFLAGS),;t t
s,@ARCH_FLAG@,$(ARCH_FLAG),;t t s,@ARCH_FLAG@,$(ARCH_FLAG),;t t
s,@STATIC@,$(STATIC),;t t s,@STATIC@,$(STATIC),;t t
s,@CCDLFLAGS@,,;t t s,@CCDLFLAGS@,,;t t