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

* ext/tk/extconf.rb: fails on Mac OS X [Ruby 1.9 - Bug #4853]

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32023 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagai 2011-06-12 07:22:41 +00:00
parent f0041fa0fd
commit 483efa1fda
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Sun Jun 12 16:19:48 2011 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/extconf.rb: fail on Mac OS X. [Bug #4853][ruby-dev:43655]
Sun Jun 12 15:56:08 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com> Sun Jun 12 15:56:08 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* thread.c: remove th->transition_for_lock. It's thread unsafe. * thread.c: remove th->transition_for_lock. It's thread unsafe.

18
ext/tk/extconf.rb
View file

@ -1467,11 +1467,9 @@ def setup_for_macosx_framework(tclver, tkver)
end end
if TkLib_Config["tcl-framework-header"] if TkLib_Config["tcl-framework-header"]
(TclConfig_Info['TCL_INCLUDE_SPEC'] ||= "") << TclConfig_Info['TCL_INCLUDE_SPEC'][0,0] =
" -I#{TkLib_Config["tcl-framework-header"].quote} " " -I#{TkLib_Config["tcl-framework-header"].quote} "
else else
TclConfig_Info['TCL_INCLUDE_SPEC'] = ""
tcl_base = File.join(TkLib_Config["tcltk-framework"], 'Tcl.framework') tcl_base = File.join(TkLib_Config["tcltk-framework"], 'Tcl.framework')
if tclver if tclver
TclConfig_Info['TCL_INCLUDE_SPEC'] << TclConfig_Info['TCL_INCLUDE_SPEC'] <<
@ -1488,11 +1486,9 @@ def setup_for_macosx_framework(tclver, tkver)
end end
if TkLib_Config["tk-framework-header"] if TkLib_Config["tk-framework-header"]
TkConfig_Info['TK_INCLUDE_SPEC'] = TkConfig_Info['TK_INCLUDE_SPEC'][0,0] =
" -I#{TkLib_Config["tk-framework-header"].quote} " " -I#{TkLib_Config["tk-framework-header"].quote} "
else else
TkConfig_Info['TK_INCLUDE_SPEC'] = ""
tk_base = File.join(TkLib_Config["tcltk-framework"], 'Tk.framework') tk_base = File.join(TkLib_Config["tcltk-framework"], 'Tk.framework')
if tkver if tkver
TkConfig_Info['TK_INCLUDE_SPEC'] << TkConfig_Info['TK_INCLUDE_SPEC'] <<
@ -1889,6 +1885,11 @@ tcl_ldir = tk_ldir unless tcl_ldir
tk_idir = tcl_idir unless tk_idir tk_idir = tcl_idir unless tk_idir
tk_ldir = tcl_ldir unless tk_ldir tk_ldir = tcl_ldir unless tk_ldir
TclConfig_Info['TCL_INCLUDE_SPEC'] ||= ""
TkConfig_Info['TK_INCLUDE_SPEC'] ||= ""
TclConfig_Info['TCL_INCLUDE_SPEC'][0,0] = "-I#{tcl_idir.quote} " if tcl_idir
TkConfig_Info['TK_INCLUDE_SPEC'][0,0] = "-I#{tk_idir.quote} " if tk_idir
# get tclConfig.sh/tkConfig.sh # get tclConfig.sh/tkConfig.sh
TkLib_Config["tcl-NG-path"] = [] TkLib_Config["tcl-NG-path"] = []
TkLib_Config["tk-NG-path"] = [] TkLib_Config["tk-NG-path"] = []
@ -1908,9 +1909,6 @@ TkConfig_Info.merge!(TkLib_Config["tkConfig_info"]) if TkLib_Config["tkConfig_in
TclConfig_Info['config_file_path'] ||= tclcfg TclConfig_Info['config_file_path'] ||= tclcfg
TkConfig_Info['config_file_path'] ||= tkcfg TkConfig_Info['config_file_path'] ||= tkcfg
TclConfig_Info['TCL_INCLUDE_SPEC'] = "-I#{tcl_idir.quote}" if tcl_idir
TkConfig_Info['TK_INCLUDE_SPEC'] = "-I#{tk_idir.quote}" if tk_idir
tk_cfg_dir = File.dirname(TkConfig_Info['config_file_path']) rescue nil tk_cfg_dir = File.dirname(TkConfig_Info['config_file_path']) rescue nil
tcl_cfg_dir = File.dirname(TclConfig_Info['config_file_path']) rescue nil tcl_cfg_dir = File.dirname(TclConfig_Info['config_file_path']) rescue nil
@ -1950,6 +1948,7 @@ if TkLib_Config["tcltk-framework"]
($LDFLAGS ||= "") << " -L#{TkLib_Config["tcl-build-dir"].quote} -Wl,-R#{TkLib_Config["tcl-build-dir"].quote}" if TkLib_Config["tcl-build-dir"] ($LDFLAGS ||= "") << " -L#{TkLib_Config["tcl-build-dir"].quote} -Wl,-R#{TkLib_Config["tcl-build-dir"].quote}" if TkLib_Config["tcl-build-dir"]
if tcl_cfg_dir if tcl_cfg_dir
TclConfig_Info['TCL_LIBS'] ||= ""
($INCFLAGS ||= "") << ' ' << TclConfig_Info['TCL_INCLUDE_SPEC'] ($INCFLAGS ||= "") << ' ' << TclConfig_Info['TCL_INCLUDE_SPEC']
$LDFLAGS << ' ' << TclConfig_Info['TCL_LIBS'] $LDFLAGS << ' ' << TclConfig_Info['TCL_LIBS']
if stubs if stubs
@ -1974,6 +1973,7 @@ if TkLib_Config["tcltk-framework"]
$LDFLAGS << " -L#{TkLib_Config["tk-build-dir"].quote} -Wl,-R#{TkLib_Config["tk-build-dir"].quote}" if TkLib_Config["tk-build-dir"] $LDFLAGS << " -L#{TkLib_Config["tk-build-dir"].quote} -Wl,-R#{TkLib_Config["tk-build-dir"].quote}" if TkLib_Config["tk-build-dir"]
if tk_cfg_dir if tk_cfg_dir
TkConfig_Info['TK_LIBS'] ||= ""
($INCFLAGS ||= "") << ' ' << TkConfig_Info['TK_INCLUDE_SPEC'] ($INCFLAGS ||= "") << ' ' << TkConfig_Info['TK_INCLUDE_SPEC']
$LDFLAGS << ' ' << TkConfig_Info['TK_LIBS'] $LDFLAGS << ' ' << TkConfig_Info['TK_LIBS']
if stubs if stubs