Permalink
Browse files

Remove the GNU formulae --default-names options.

Provoked by #9574.
  • Loading branch information...
1 parent d8a552c commit 6f7920043084c5e172e34492d981a7b132b866f3 @MikeMcQuaid MikeMcQuaid committed Jan 24, 2012
Showing with 15 additions and 44 deletions.
  1. +11 −12 Library/Formula/binutils.rb
  2. +2 −24 Library/Formula/coreutils.rb
  3. +2 −8 Library/Formula/findutils.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
@@ -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 @@ def caveats
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
@@ -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

0 comments on commit 6f79200

Please sign in to comment.