From bfaad4400f62b2e7bbc1bf16a6a0603b5c412100 Mon Sep 17 00:00:00 2001 From: FX Coudert Date: Wed, 31 Oct 2018 16:01:41 +0100 Subject: [PATCH] postgresql@9.6: remove options --- Formula/postgresql@9.6.rb | 34 ++++++---------------------------- 1 file changed, 6 insertions(+), 28 deletions(-) diff --git a/Formula/postgresql@9.6.rb b/Formula/postgresql@9.6.rb index 09433b1a04..0047b9633e 100644 --- a/Formula/postgresql@9.6.rb +++ b/Formula/postgresql@9.6.rb @@ -14,27 +14,13 @@ class PostgresqlAT96 < Formula keg_only :versioned_formula - option "without-perl", "Build without Perl support" - option "without-tcl", "Build without Tcl support" - option "with-dtrace", "Build with DTrace support" - option "with-python", "Enable PL/Python3 (incompatible with --with-python@2)" - option "with-python@2", "Enable PL/Python2" + option "with-python", "Enable PL/Python3" - deprecated_option "no-perl" => "without-perl" - deprecated_option "no-tcl" => "without-tcl" - deprecated_option "enable-dtrace" => "with-dtrace" deprecated_option "with-python3" => "with-python" depends_on "openssl" depends_on "readline" - depends_on "python" => :optional - depends_on "python@2" => :optional - - fails_with :clang do - build 211 - cause "Miscompilation resulting in segfault on queries" - end def install # avoid adding the SDK library directory to the linker search path @@ -58,32 +44,24 @@ class PostgresqlAT96 < Formula --with-pam --with-libxml --with-libxslt + --with-perl + --with-uuid=e2fs ] - args << "--with-perl" if build.with? "perl" - - which_python = nil - if build.with?("python") && build.with?("python@2") - odie "Cannot provide both --with-python and --with-python@2" - elsif build.with?("python") || build.with?("python@2") + if build.with?("python") args << "--with-python" - which_python = which(build.with?("python") ? "python3" : "python2.7") + ENV["PYTHON"] = which("python3") end - ENV["PYTHON"] = which_python # The CLT is required to build Tcl support on 10.7 and 10.8 because # tclConfig.sh is not part of the SDK - if build.with?("tcl") && (MacOS.version >= :mavericks || MacOS::CLT.installed?) + if MacOS.version >= :mavericks || MacOS::CLT.installed? args << "--with-tcl" - if File.exist?("#{MacOS.sdk_path}/System/Library/Frameworks/Tcl.framework/tclConfig.sh") args << "--with-tclconfig=#{MacOS.sdk_path}/System/Library/Frameworks/Tcl.framework" end end - args << "--enable-dtrace" if build.with? "dtrace" - args << "--with-uuid=e2fs" - # As of Xcode/CLT 10.x the Perl headers were moved from /System # to inside the SDK, so we need to use `-iwithsysroot` instead # of `-I` to point to the correct location.