nobu	2014-01-10 00:47:54 +0900 (Fri, 10 Jan 2014)

  New Revision: 44541

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

  Log:
    tk/extconf.rb: fix libpathflag arguments
    
    * ext/tk/extconf.rb: fix to pass arrays instead of strings to
      libpathflag.  patch at [ruby-core:59665].  [Bug #9386]

  Modified files:
    trunk/ChangeLog
    trunk/ext/tk/extconf.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 44540)
+++ ChangeLog	(revision 44541)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Fri Jan 10 00:47:52 2014  Josef Stribny  <strzibny@g...>
+
+	* ext/tk/extconf.rb: fix to pass arrays instead of strings to
+	  libpathflag.  patch at [ruby-core:59665].  [Bug #9386]
+
 Thu Jan  9 20:49:22 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* configure.in: -mstackrealign is necessary for -msse2 working.
Index: ext/tk/extconf.rb
===================================================================
--- ext/tk/extconf.rb	(revision 44540)
+++ ext/tk/extconf.rb	(revision 44541)
@@ -623,7 +623,7 @@ def libcheck_for_tclConfig(tcldir, tkdir https://github.com/ruby/ruby/blob/trunk/ext/tk/extconf.rb#L623
           $INCFLAGS << " -I" << File.join(File.dirname(File.dirname(file)),"include") if is_win32?
         else
           tcllibs = append_library($libs, libname)
-          tcllibs = "#{libpathflag(tcldir)} #{tcllibs}"
+          tcllibs = "#{libpathflag([tcldir])} #{tcllibs}"
 
           # FIX ME: avoid pathname trouble (fail to find) on MinGW.
           $INCFLAGS << " -I" << File.join(File.dirname(tcldir),"include") if is_win32?
@@ -665,7 +665,7 @@ def libcheck_for_tclConfig(tcldir, tkdir https://github.com/ruby/ruby/blob/trunk/ext/tk/extconf.rb#L665
         else
           tklibs = append_library("", libname)
           #tklibs = append_library("", $1)
-          tklibs = "#{libpathflag(tkdir)} #{tklibs}"
+          tklibs = "#{libpathflag([tkdir])} #{tklibs}"
 
           # FIX ME: avoid pathname trouble (fail to find) on MinGW.
           $INCFLAGS << " -I" << File.join(File.dirname(tcldir),"include") if is_win32?
@@ -1161,7 +1161,7 @@ def find_tcl(tcllib, stubs, version, *op https://github.com/ruby/ruby/blob/trunk/ext/tk/extconf.rb#L1161
                   tcllibs = libs_param + " -DSTATIC_BUILD " + fname.quote
                 else
                   tcllibs = append_library($libs, lib_w_sufx)
-                  tcllibs = "#{libpathflag(path)} #{tcllibs}"
+                  tcllibs = "#{libpathflag([path])} #{tcllibs}"
                 end
                 if try_func(func, tcllibs, ["tcl.h"])
                   return [true, path, nil, tcllibs, *inc]
@@ -1300,7 +1300,7 @@ def find_tk(tklib, stubs, version, *opt_ https://github.com/ruby/ruby/blob/trunk/ext/tk/extconf.rb#L1300
                   tklibs = libs_param + " -DSTATIC_BUILD " + fname.quote
                 else
                   tklibs = append_library($libs, lib_w_sufx)
-                  tklibs = "#{libpathflag(path)} #{tklibs}"
+                  tklibs = "#{libpathflag([path])} #{tklibs}"
                 end
                 if try_func(func, tklibs, ["tcl.h", "tk.h"])
                   return [true, path, nil, tklibs, *inc]
@@ -2003,7 +2003,7 @@ $defs += collect_tcltk_defs(TclConfig_In https://github.com/ruby/ruby/blob/trunk/ext/tk/extconf.rb#L2003
 # MacOS X Frameworks?
 if TkLib_Config["tcltk-framework"]
   puts("Use MacOS X Frameworks.")
-  ($LDFLAGS ||= "") << " " << libpathflag(TkLib_Config["tcl-build-dir"]) if TkLib_Config["tcl-build-dir"]
+  ($LDFLAGS ||= "") << " " << libpathflag([TkLib_Config["tcl-build-dir"]]) if TkLib_Config["tcl-build-dir"]
 
   libs = ''
   if tcl_cfg_dir
@@ -2029,7 +2029,7 @@ if TkLib_Config["tcltk-framework"] https://github.com/ruby/ruby/blob/trunk/ext/tk/extconf.rb#L2029
     end
   end
 
-  libs << " " << libpathflag(TkLib_Config["tk-build-dir"]) if TkLib_Config["tk-build-dir"]
+  libs << " " << libpathflag([TkLib_Config["tk-build-dir"]]) if TkLib_Config["tk-build-dir"]
 
   if tk_cfg_dir
     TkConfig_Info['TK_LIBS'] ||= ""

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