Fix tcl location (#14385)

* pidgin: fix finding Tcl/Tk on 10.13

* postgresql: fix finding Tcl/Tk on 10.13

* postgresql@9.4: fix finding Tcl/Tk on 10.13

* postgresql@9.5: fix finding Tcl/Tk on 10.13
master
Misty De Meo 2017-06-09 17:47:21 -07:00 committed by GitHub
parent 2e3bec1594
commit 80032cbacb
4 changed files with 8 additions and 8 deletions

View File

@ -60,8 +60,8 @@ class Pidgin < Formula
args << "--disable-perl" if build.without? "perl" args << "--disable-perl" if build.without? "perl"
args << "--enable-cyrus-sasl" if build.with? "gsasl" args << "--enable-cyrus-sasl" if build.with? "gsasl"
args << "--with-tclconfig=#{MacOS.sdk_path}/usr/lib" args << "--with-tclconfig=#{MacOS.sdk_path}/System/Library/Frameworks/Tcl.framework"
args << "--with-tkconfig=#{MacOS.sdk_path}/usr/lib" args << "--with-tkconfig=#{MacOS.sdk_path}/System/Library/Frameworks/Tk.framework"
args << "--disable-gtkui" if build.without? "gui" args << "--disable-gtkui" if build.without? "gui"
system "./configure", *args system "./configure", *args

View File

@ -76,8 +76,8 @@ class Postgresql < Formula
if build.with?("tcl") && (MacOS.version >= :mavericks || MacOS::CLT.installed?) if build.with?("tcl") && (MacOS.version >= :mavericks || MacOS::CLT.installed?)
args << "--with-tcl" args << "--with-tcl"
if File.exist?("#{MacOS.sdk_path}/usr/lib/tclConfig.sh") if File.exist?("#{MacOS.sdk_path}/System/Library/Frameworks/Tcl.framework/tclConfig.sh")
args << "--with-tclconfig=#{MacOS.sdk_path}/usr/lib" args << "--with-tclconfig=#{MacOS.sdk_path}/System/Library/Frameworks/Tcl.framework"
end end
end end

View File

@ -52,8 +52,8 @@ class PostgresqlAT94 < Formula
if build.with?("tcl") && (MacOS.version >= :mavericks || MacOS::CLT.installed?) if build.with?("tcl") && (MacOS.version >= :mavericks || MacOS::CLT.installed?)
args << "--with-tcl" args << "--with-tcl"
if File.exist?("#{MacOS.sdk_path}/usr/lib/tclConfig.sh") if File.exist?("#{MacOS.sdk_path}/System/Library/Frameworks/Tcl.framework/tclConfig.sh")
args << "--with-tclconfig=#{MacOS.sdk_path}/usr/lib" args << "--with-tclconfig=#{MacOS.sdk_path}/System/Library/Frameworks/Tcl.framework"
end end
end end

View File

@ -68,8 +68,8 @@ class PostgresqlAT95 < Formula
if build.with?("tcl") && (MacOS.version >= :mavericks || MacOS::CLT.installed?) if build.with?("tcl") && (MacOS.version >= :mavericks || MacOS::CLT.installed?)
args << "--with-tcl" args << "--with-tcl"
if File.exist?("#{MacOS.sdk_path}/usr/lib/tclConfig.sh") if File.exist?("#{MacOS.sdk_path}/System/Library/Frameworks/Tcl.framework/tclConfig.sh")
args << "--with-tclconfig=#{MacOS.sdk_path}/usr/lib" args << "--with-tclconfig=#{MacOS.sdk_path}/System/Library/Frameworks/Tcl.framework"
end end
end end