nobu	2012-05-20 12:25:14 +0900 (Sun, 20 May 2012)

  New Revision: 35722

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35722

  Log:
    Bug #6462: EXTSOLIBS
    
    * Makefile.in (LIBRUBY_SO): link EXTSOLIBS too.
    * ext/extmk.rb (mf.macro): use EXTSOLIBS instead of SOLIBS to get rid
      of discard libraries needed by default.  [Bug #6462]

  Modified files:
    trunk/ChangeLog
    trunk/Makefile.in
    trunk/common.mk
    trunk/ext/extmk.rb
    trunk/win32/Makefile.sub

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 35721)
+++ ChangeLog	(revision 35722)
@@ -1,3 +1,10 @@
+Sun May 20 12:25:10 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* Makefile.in (LIBRUBY_SO): link EXTSOLIBS too.
+
+	* ext/extmk.rb (mf.macro): use EXTSOLIBS instead of SOLIBS to get rid
+	  of discard libraries needed by default.  [Bug #6462]
+
 Sat May 19 19:04:38 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/extmk.rb (command_output): ENCOBJS is needed for all linked
Index: common.mk
===================================================================
--- common.mk	(revision 35721)
+++ common.mk	(revision 35722)
@@ -34,6 +34,7 @@
 MAINOBJ       = $(NORMALMAINOBJ)
 EXTOBJS	      =
 DLDOBJS	      = $(DMYEXT)
+EXTSOLIBS     =
 MINIOBJS      = $(ARCHMINIOBJS) dmyencoding.$(OBJEXT) dmyversion.$(OBJEXT) miniprelude.$(OBJEXT)
 ENC_MK        = enc.mk
 
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 35721)
+++ win32/Makefile.sub	(revision 35722)
@@ -222,6 +222,9 @@
 !if !defined(EXTLIBS)
 EXTLIBS =
 !endif
+!if !defined(EXTSOLIBS)
+EXTSOLIBS =
+!endif
 !if !defined(LIBS)
 LIBS = oldnames.lib user32.lib advapi32.lib shell32.lib ws2_32.lib imagehlp.lib $(EXTLIBS)
 !endif
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 35721)
+++ Makefile.in	(revision 35722)
@@ -199,7 +199,7 @@
 $(LIBRUBY_SO):
 		@-$(PRE_LIBRUBY_UPDATE)
 		$(ECHO) linking shared-library $@
-		$(Q) $(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) $(OUTFLAG)$@
+		$(Q) $(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) $(EXTSOLIBS) $(OUTFLAG)$@
 		-$(Q) $(OBJCOPY) -w -L '$(SYMBOL_PREFIX)Init_*' -L '$(SYMBOL_PREFIX)*_threadptr_*' $@
 		@-$(MINIRUBY) -e 'ARGV.each{|link| File.delete link if File.exist? link; \
 						  File.symlink "$(LIBRUBY_SO)", link}' \
Index: ext/extmk.rb
===================================================================
--- ext/extmk.rb	(revision 35721)
+++ ext/extmk.rb	(revision 35722)
@@ -663,7 +663,7 @@
       mf.print "#{tgt}:\n\t$(Q)$(MAKE) "
       mf.print "$(MFLAGS) "
       if enable_config("shared", $enable_shared)
-        mf.print %[DLDOBJS="$(EXTOBJS)" SOLIBS="$(ENCOBJS) $(EXTLIBS)" ]
+        mf.print %[DLDOBJS="$(EXTOBJS)" EXTSOLIBS="$(ENCOBJS) $(EXTLIBS)" ]
         mf.print 'LIBRUBY_SO_UPDATE=$(LIBRUBY_EXTS) '
       else
         mf.print %[EXTOBJS="$(EXTOBJS) $(ENCOBJS)" EXTLIBS="$(EXTLIBS)" ]

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/