ruby-changes:24451
From: nobu <ko1@a...>
Date: Tue, 24 Jul 2012 00:00:22 +0900 (JST)
Subject: [ruby-changes:24451] nobu:r36502 (trunk): enc/Makefile.in: TARGET_NAME TARGET_ENTRY
nobu 2012-07-23 23:58:42 +0900 (Mon, 23 Jul 2012) New Revision: 36502 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=36502 Log: enc/Makefile.in: TARGET_NAME TARGET_ENTRY * 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. Modified files: trunk/ChangeLog trunk/enc/Makefile.in trunk/enc/depend trunk/win32/Makefile.sub Index: ChangeLog =================================================================== --- ChangeLog (revision 36501) +++ ChangeLog (revision 36502) @@ -1,3 +1,10 @@ +Mon Jul 23 23:58:40 2012 Nobuyoshi Nakada <nobu@r...> + + * 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@f...> * lib/open-uri.rb: use respond_to? to test Tempfile. Index: enc/Makefile.in =================================================================== --- enc/Makefile.in (revision 36501) +++ enc/Makefile.in (revision 36502) @@ -51,9 +51,13 @@ LDSHARED = @LDSHARED@ ldflags = $(LDFLAGS) dldflags = @DLDFLAGS@ +extdldflags = @EXTDLDFLAGS@ archflag = @ARCH_FLAG@ -DLDFLAGS = $(ldflags) $(dldflags) $(archflag) +DLDFLAGS = $(ldflags) $(dldflags) $(extdldflags) $(archflag) 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@ Index: enc/depend =================================================================== --- enc/depend (revision 36501) +++ enc/depend (revision 36502) @@ -1,8 +1,6 @@ % inplace = File.identical?($srcdir, ".") % workdirs = %w"$(ENCSODIR) $(TRANSSODIR) enc enc/trans" % CONFIG["WORKDIRS"] = workdirs.join(' ') -% CONFIG["DLDFLAGS"].sub!(/(\A|\s)(-\S+(?:\s*\w*)?\$\(TARGET\)\S*)/, '\1') -% dldflags = $2 % enable_shared = CONFIG['ENABLE_SHARED'] == 'yes' % deffile = (true if /\$\(DEFFILE\)/ =~ CONFIG["LINK_SO"]) % dependencies = ENCS + TRANS @@ -115,7 +113,6 @@ $(ECHO) linking <%=mesg%> $(@F) % cmd = link_so.sub(/\$\(OBJS\)/) {obj} % base = File.basename(e) -% cmd.sub!(/(?=\$\(DLDFLAGS\))/) {dldflags.sub(/\$\(TARGET\)/) {base} + " "} if dldflags % if df $(Q)echo> <%=df%> EXPORTS $(Q)echo>> <%=df%> <%=EXPORT_PREFIX%>Init_<%=base%> Index: win32/Makefile.sub =================================================================== --- win32/Makefile.sub (revision 36501) +++ win32/Makefile.sub (revision 36502) @@ -777,6 +777,7 @@ s,@XCFLAGS@,$(XCFLAGS),;t t s,@XLDFLAGS@,$(XLDFLAGS),;t t s,@DLDFLAGS@,$(DLDFLAGS) $$(LIBPATH),;t t +s,@EXTDLDFLAGS@,$(EXTDLDFLAGS),;t t s,@ARCH_FLAG@,$(ARCH_FLAG),;t t s,@STATIC@,$(STATIC),;t t s,@CCDLFLAGS@,,;t t -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/