Project

General

Profile

Download (3.11 KB)

Bug #9386 » 0001-Fix-tk-extconf-to-pass-arrays-instead-of-strings-to-.patch

alternative, less invasive, patch - jstribny (Josef Stribny), 01/10/2014 12:10 AM

View differences:

ext/tk/extconf.rb
$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?
......
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?
......
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]
......
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]
......
# 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
......
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'] ||= ""
(2-2/2)