aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Nagel2014-10-05 17:02:29 -0500
committerJack Nagel2014-10-05 18:22:10 -0500
commite1bf5b419e228dd5b1e5bc29e921b35dd7aaeaa3 (patch)
tree5b1ca1301e4125277e7685cca309282d5385720c
parent2ff92e42a989c429f740e1b1b09d22a78350bc5d (diff)
downloadhomebrew-e1bf5b419e228dd5b1e5bc29e921b35dd7aaeaa3.tar.bz2
coreutils: upstream fix for stdbuf
Fixes #32906.
-rw-r--r--Library/Formula/coreutils.rb24
1 files changed, 21 insertions, 3 deletions
diff --git a/Library/Formula/coreutils.rb b/Library/Formula/coreutils.rb
index dce8237e8..112728a58 100644
--- a/Library/Formula/coreutils.rb
+++ b/Library/Formula/coreutils.rb
@@ -5,16 +5,19 @@ class Coreutils < Formula
url "http://ftpmirror.gnu.org/coreutils/coreutils-8.23.tar.xz"
mirror "https://ftp.gnu.org/gnu/coreutils/coreutils-8.23.tar.xz"
sha256 "ec43ca5bcfc62242accb46b7f121f6b684ee21ecd7d075059bf650ff9e37b82d"
+ revision 1
bottle do
- sha1 "20ea5c8d4b4bafdcd70999129257e5a5b1c30f98" => :mavericks
- sha1 "d4ecd35db414eefdb160eadd76da270319ad91af" => :mountain_lion
- sha1 "63a5af5c94f1b0c4f3331f979aca98bbfde27445" => :lion
end
conflicts_with "ganglia", :because => "both install `gstat` binaries"
conflicts_with "idutils", :because => "both install `gid` and `gid.1`"
+ # Patch adapted from upstream commits:
+ # http://git.savannah.gnu.org/gitweb/?p=coreutils.git;a=commitdiff;h=6f9b018
+ # http://git.savannah.gnu.org/gitweb/?p=coreutils.git;a=commitdiff;h=3cf19b5
+ patch :DATA
+
def install
system "./configure", "--prefix=#{prefix}",
"--program-prefix=g",
@@ -56,3 +59,18 @@ class Coreutils < Formula
filenames.sort
end
end
+
+__END__
+diff --git a/Makefile.in b/Makefile.in
+index 140a428..bae3163 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -2566,7 +2566,7 @@ pkglibexecdir = @pkglibexecdir@
+ # Use 'ginstall' in the definition of PROGRAMS and in dependencies to avoid
+ # confusion with the 'install' target. The install rule transforms 'ginstall'
+ # to install before applying any user-specified name transformations.
+-transform = s/ginstall/install/; $(program_transform_name)
++transform = s/ginstall/install/;/libstdbuf/!$(program_transform_name)
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+ ALLOCA_H = @ALLOCA_H@