From 3dc3c2e19060434625c83572efe84194f534e022 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Thu, 3 Apr 2014 09:11:51 -0500 Subject: [PATCH] Add keg-only reason symbols for Xcode 4.3 and Xcode 5 Closes Homebrew/homebrew#28095. --- Formula/autoconf.rb | 4 +--- Formula/automake.rb | 4 +--- Formula/bsdmake.rb | 4 +--- Formula/cvs.rb | 2 +- Formula/libtool.rb | 4 +--- 5 files changed, 5 insertions(+), 13 deletions(-) diff --git a/Formula/autoconf.rb b/Formula/autoconf.rb index 1d79e68edba..271170624d4 100644 --- a/Formula/autoconf.rb +++ b/Formula/autoconf.rb @@ -13,9 +13,7 @@ class Autoconf < Formula sha1 "7d31f63e5ddd1bbbf0397b0b70df1ff9e70f998b" => :lion end - if MacOS::Xcode.provides_autotools? or File.file? "/usr/bin/autoconf" - keg_only "Xcode (up to and including 4.2) provides (a rather old) Autoconf." - end + keg_only :provided_until_xcode43 def install ENV['PERL'] = '/usr/bin/perl' diff --git a/Formula/automake.rb b/Formula/automake.rb index 10fd6e63f5f..ae31a1448df 100644 --- a/Formula/automake.rb +++ b/Formula/automake.rb @@ -15,9 +15,7 @@ class Automake < Formula # Always needs a newer autoconf, even on Snow Leopard. depends_on 'autoconf' => :run - if MacOS::Xcode.provides_autotools? or File.file? "/usr/bin/automake" - keg_only "Xcode (up to and including 4.2) provides (a rather old) Automake." - end + keg_only :provided_until_xcode43 def install ENV['PERL'] = '/usr/bin/perl' diff --git a/Formula/bsdmake.rb b/Formula/bsdmake.rb index 67cfb823956..a6368c7ca5d 100644 --- a/Formula/bsdmake.rb +++ b/Formula/bsdmake.rb @@ -5,9 +5,7 @@ class Bsdmake < Formula url 'http://opensource.apple.com/tarballs/bsdmake/bsdmake-24.tar.gz' sha1 '9ce3c3fc01e0eb47d82827b1eb227eb371fefd5c' - if MacOS::Xcode.provides_autotools? or File.file? "/usr/bin/bsdmake" - keg_only "Recent versions of OS X no longer provide this tool." - end + keg_only :provided_until_xcode43 # MacPorts patches to make bsdmake play nice with our prefix system # Also a MacPorts patch to circumvent setrlimit error diff --git a/Formula/cvs.rb b/Formula/cvs.rb index a6e3137410a..97a5d7f4d43 100644 --- a/Formula/cvs.rb +++ b/Formula/cvs.rb @@ -10,7 +10,7 @@ class Cvs < Formula url 'http://ftp.gnu.org/non-gnu/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2' sha1 '93a8dacc6ff0e723a130835713235863f1f5ada9' - keg_only "Xcode (< 5.0) provides CVS" if MacOS::Xcode.provides_cvs? + keg_only :provided_until_xcode5 { "PR5178707" => "372385b34a346753249a7808e8d5db0a6cadd3ee", diff --git a/Formula/libtool.rb b/Formula/libtool.rb index 97a16b2e6e3..23380406864 100644 --- a/Formula/libtool.rb +++ b/Formula/libtool.rb @@ -16,9 +16,7 @@ class Libtool < Formula sha1 '6873a7b72e86f369f43125c0e29ae5cdbc2d67c1' => :lion end - if MacOS::Xcode.provides_autotools? or File.file? "/usr/bin/glibtoolize" - keg_only "Xcode 4.2 and below provide glibtool." - end + keg_only :provided_until_xcode43 option :universal