archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 01:23:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

* ext/tk/extconf.rb: Default search_versions are set 8.5 and 8.4 only. At present, Tcl/Tk8.6 is not supported.

Browse source 
* ext/tk/extconf.rb: Fix typo. [ruby-core:56084] [Bug #8656]
* ext/tk/extconf.rb: Don't add "-ltk -ltcl" for MacOSX frameworks, because they may link improper libraries.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42370 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagai 2013-08-04 01:30:46 +00:00
parent 5be2e8eb39
commit 317effe374
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ext/tk/extconf.rb
View file

@ -8,7 +8,8 @@ TkLib_Config = {}
TkLib_Config['search_versions'] = TkLib_Config['search_versions'] =
# %w[8.9 8.8 8.7 8.6 8.5 8.4 8.3 8.2 8.1 8.0 7.6 4.2] # %w[8.9 8.8 8.7 8.6 8.5 8.4 8.3 8.2 8.1 8.0 7.6 4.2]
# %w[8.7 8.6 8.5 8.4 8.3 8.2 8.1 8.0] # %w[8.7 8.6 8.5 8.4 8.3 8.2 8.1 8.0]
%w[8.7 8.6 8.5 8.4 8.0] # to shorten search steps # %w[8.7 8.6 8.5 8.4 8.0] # to shorten search steps
%w[8.5 8.4] # At present, Tcl/Tk8.6 is not supported.
TkLib_Config['major_nums'] = '87' TkLib_Config['major_nums'] = '87'
@ -315,7 +316,7 @@ def find_macosx_framework
paths.map{|dir| dir.strip.chomp('/')}.each{|dir| paths.map{|dir| dir.strip.chomp('/')}.each{|dir|
next unless File.exist?(File.join(dir, "Tcl.framework", "Headers")) next unless File.exist?(File.join(dir, "Tcl.framework", "Headers"))
next unless File.directory?(tcldir = File.join(dir, "Tcl.framework")) next unless File.directory?(tcldir = File.join(dir, "Tcl.framework"))
next unless File.exist?(File.join(dir, "Tk.framework"), "Headers") next unless File.exist?(File.join(dir, "Tk.framework", "Headers"))
next unless File.directory?(tkdir = File.join(dir, "Tk.framework")) next unless File.directory?(tkdir = File.join(dir, "Tk.framework"))
TkLib_Config["tcltk-framework"] = dir TkLib_Config["tcltk-framework"] = dir
return [tcldir, tkdir] return [tcldir, tkdir]
@ -2020,7 +2021,6 @@ if TkLib_Config["tcltk-framework"]
end end
end end
$LDFLAGS << ' ' << libs $LDFLAGS << ' ' << libs
$libs << ' -ltk -ltcl'
setup_for_macosx_framework(tclver, tkver) if tcl_cfg_dir && tk_cfg_dir setup_for_macosx_framework(tclver, tkver) if tcl_cfg_dir && tk_cfg_dir
end end
@ -2056,4 +2056,6 @@ if (TkLib_Config["tcltk-framework"] ||
puts "\nFind Tcl/Tk libraries. Make tcltklib.so which is required by Ruby/Tk." puts "\nFind Tcl/Tk libraries. Make tcltklib.so which is required by Ruby/Tk."
else else
puts "\nCan't find proper Tcl/Tk libraries. So, can't make tcltklib.so which is required by Ruby/Tk." puts "\nCan't find proper Tcl/Tk libraries. So, can't make tcltklib.so which is required by Ruby/Tk."
puts "If you have Tcl/Tk libraries on your environment, you may be able to use them with configure options (see ext/tk/README.tcltklib)."
puts "At present, Tcl/Tk8.6 is not supported. Although you can try to use Tcl/Tk8.6 with configure options, it will not work correctly. I recommend you to use Tcl/Tk8.5 or 8.4."
end end