diff options
| -rw-r--r-- | Library/Formula/binutils.rb | 23 | ||||
| -rw-r--r-- | Library/Formula/coreutils.rb | 26 | ||||
| -rw-r--r-- | Library/Formula/findutils.rb | 10 |
3 files changed, 15 insertions, 44 deletions
diff --git a/Library/Formula/binutils.rb b/Library/Formula/binutils.rb index 697bd6c81..ffa6febd3 100644 --- a/Library/Formula/binutils.rb +++ b/Library/Formula/binutils.rb @@ -7,18 +7,17 @@ class Binutils < Formula md5 'bde820eac53fa3a8d8696667418557ad' def install - args = ["--disable-debug", "--disable-dependency-tracking", - "--prefix=#{prefix}", - "--infodir=#{info}", - "--mandir=#{man}", - "--disable-werror", - "--enable-interwork", - "--enable-multilib", - "--enable-targets=x86_64-elf", - "--enable-targets=arm-none-eabi"] - args << "--program-prefix=g" unless ARGV.include? '--default-names' - - system "./configure", *args + system "./configure", "--disable-debug", + "--disable-dependency-tracking", + "--program-prefix=g", + "--prefix=#{prefix}", + "--infodir=#{info}", + "--mandir=#{man}", + "--disable-werror", + "--enable-interwork", + "--enable-multilib", + "--enable-targets=x86_64-elf", + "--enable-targets=arm-none-eabi" system "make" system "make install" end diff --git a/Library/Formula/coreutils.rb b/Library/Formula/coreutils.rb index c3b1a2e36..8c3009bc1 100644 --- a/Library/Formula/coreutils.rb +++ b/Library/Formula/coreutils.rb @@ -1,9 +1,5 @@ require 'formula' -def use_default_names? - ARGV.include? '--default-names' -end - def coreutils_aliases s = "brew_prefix=`brew --prefix`\n" @@ -31,22 +27,15 @@ class Coreutils < Formula mirror 'http://ftp.gnu.org/gnu/coreutils/coreutils-8.14.tar.xz' sha256 '0d120817c19292edb19e92ae6b8eac9020e03d51e0af9cb116cf82b65d18b02d' - def options - [['--default-names', "Do NOT prepend 'g' to the binary; will override system utils."]] - end - def install - args = ["--prefix=#{prefix}"] - args << "--program-prefix=g" unless use_default_names? - - system "./configure", *args + system "./configure", "--prefix=#{prefix}", "--program-prefix=g" system "make install" (prefix+'aliases').write(coreutils_aliases) end def caveats - unless use_default_names?; <<-EOS + <<-EOS All commands have been installed with the prefix 'g'. A file that aliases these commands to their normal names is available @@ -61,17 +50,6 @@ which is known to cause problems with "bash-completion". The man pages are still referenced with the g-prefix. EOS - else - <<-EOS -Installing coreutils using the default names will cause the utilities to -shadow system-provided BSD tools if /usr/local/bin is ahead of /usr/bin in -the path. - -This can cause problems in shell scripts. - -Some software in Homebrew expects the system-provided tools to be first in -the path, and builds may fail if the coreutils verions are used instead. - EOS end end end diff --git a/Library/Formula/findutils.rb b/Library/Formula/findutils.rb index 525e0ab25..79ae74afc 100644 --- a/Library/Formula/findutils.rb +++ b/Library/Formula/findutils.rb @@ -6,15 +6,9 @@ class Findutils < Formula homepage 'http://www.gnu.org/software/findutils/' md5 '351cc4adb07d54877fa15f75fb77d39f' - def options - [['--default-names', "Do NOT prepend 'g' to the binary; will override system utils."]] - end - def install - args = ["--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking"] - args << "--program-prefix=g" unless ARGV.include? '--default-names' - - system "./configure", *args + system "./configure", "--prefix=#{prefix}", "--program-prefix=g", + "--disable-dependency-tracking", "--disable-debug" system "make install" end end |