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

tk/extconf.rb: fix libpathflag arguments

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

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44541 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-01-09 15:47:54 +00:00
parent 791ff0a27a
commit f06ee90f95
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Fri Jan 10 00:47:52 2014 Josef Stribny <strzibny@gmail.com>
* 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@ruby-lang.org> Thu Jan 9 20:49:22 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in: -mstackrealign is necessary for -msse2 working. * configure.in: -mstackrealign is necessary for -msse2 working.

12
ext/tk/extconf.rb
View file

@ -623,7 +623,7 @@ def libcheck_for_tclConfig(tcldir, tkdir, tclconf, tkconf)
$INCFLAGS << " -I" << File.join(File.dirname(File.dirname(file)),"include") if is_win32? $INCFLAGS << " -I" << File.join(File.dirname(File.dirname(file)),"include") if is_win32?
else else
tcllibs = append_library($libs, libname) tcllibs = append_library($libs, libname)
tcllibs = "#{libpathflag(tcldir)} #{tcllibs}" tcllibs = "#{libpathflag([tcldir])} #{tcllibs}"
# FIX ME: avoid pathname trouble (fail to find) on MinGW. # FIX ME: avoid pathname trouble (fail to find) on MinGW.
$INCFLAGS << " -I" << File.join(File.dirname(tcldir),"include") if is_win32? $INCFLAGS << " -I" << File.join(File.dirname(tcldir),"include") if is_win32?
@ -665,7 +665,7 @@ def libcheck_for_tclConfig(tcldir, tkdir, tclconf, tkconf)
else else
tklibs = append_library("", libname) tklibs = append_library("", libname)
#tklibs = append_library("", $1) #tklibs = append_library("", $1)
tklibs = "#{libpathflag(tkdir)} #{tklibs}" tklibs = "#{libpathflag([tkdir])} #{tklibs}"
# FIX ME: avoid pathname trouble (fail to find) on MinGW. # FIX ME: avoid pathname trouble (fail to find) on MinGW.
$INCFLAGS << " -I" << File.join(File.dirname(tcldir),"include") if is_win32? $INCFLAGS << " -I" << File.join(File.dirname(tcldir),"include") if is_win32?
@ -1161,7 +1161,7 @@ def find_tcl(tcllib, stubs, version, *opt_paths)
tcllibs = libs_param + " -DSTATIC_BUILD " + fname.quote tcllibs = libs_param + " -DSTATIC_BUILD " + fname.quote
else else
tcllibs = append_library($libs, lib_w_sufx) tcllibs = append_library($libs, lib_w_sufx)
tcllibs = "#{libpathflag(path)} #{tcllibs}" tcllibs = "#{libpathflag([path])} #{tcllibs}"
end end
if try_func(func, tcllibs, ["tcl.h"]) if try_func(func, tcllibs, ["tcl.h"])
return [true, path, nil, tcllibs, *inc] return [true, path, nil, tcllibs, *inc]
@ -1300,7 +1300,7 @@ def find_tk(tklib, stubs, version, *opt_paths)
tklibs = libs_param + " -DSTATIC_BUILD " + fname.quote tklibs = libs_param + " -DSTATIC_BUILD " + fname.quote
else else
tklibs = append_library($libs, lib_w_sufx) tklibs = append_library($libs, lib_w_sufx)
tklibs = "#{libpathflag(path)} #{tklibs}" tklibs = "#{libpathflag([path])} #{tklibs}"
end end
if try_func(func, tklibs, ["tcl.h", "tk.h"]) if try_func(func, tklibs, ["tcl.h", "tk.h"])
return [true, path, nil, tklibs, *inc] return [true, path, nil, tklibs, *inc]
@ -2003,7 +2003,7 @@ $defs += collect_tcltk_defs(TclConfig_Info['TCL_DEFS'], TkConfig_Info['TK_DEFS']
# MacOS X Frameworks? # MacOS X Frameworks?
if TkLib_Config["tcltk-framework"] if TkLib_Config["tcltk-framework"]
puts("Use MacOS X Frameworks.") 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 = '' libs = ''
if tcl_cfg_dir if tcl_cfg_dir
@ -2029,7 +2029,7 @@ if TkLib_Config["tcltk-framework"]
end end
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 if tk_cfg_dir
TkConfig_Info['TK_LIBS'] ||= "" TkConfig_Info['TK_LIBS'] ||= ""