crosstool-ng: support compiling with grep

Closes #32884.

1 files changed, 36 insertions, 31 deletions

diff --git a/Library/Formula/crosstool-ng.rb b/Library/Formula/crosstool-ng.rb
index 071f6e68b..2a8195cb0 100644
--- a/Library/Formula/crosstool-ng.rb
+++ b/Library/Formula/crosstool-ng.rb
@@ -2,8 +2,8 @@ require 'formula'
 
 class CrosstoolNg < Formula
   homepage 'http://crosstool-ng.org'
-  url 'http://crosstool-ng.org/download/crosstool-ng/crosstool-ng-1.19.0.tar.bz2'
-  sha1 'b7ae3e90756b499ff5362064b7d80f8a45d09bfb'
+  url 'http://crosstool-ng.org/download/crosstool-ng/crosstool-ng-1.20.0.tar.bz2'
+  sha1 'b11f7ee706753b8cf822f98b549f8ab9dd8da9c7'
 
   depends_on :autoconf
   depends_on :automake
@@ -14,25 +14,46 @@ class CrosstoolNg < Formula
   depends_on 'gawk'
   depends_on 'binutils'
   depends_on 'libelf'
+  depends_on 'homebrew/dupes/grep' => :optional
+  depends_on 'homebrew/dupes/make' => :optional
 
   # Avoid superenv to prevent https://github.com/mxcl/homebrew/pull/10552#issuecomment-9736248
   env :std
 
-  # Fixes clang offsetof compatability. Took better patch from #14547
-  patch :DATA
+  # Patch to fix clang offsetof. Can be removed when adopted upstream.
+  # http://patchwork.ozlabs.org/patch/400328/
+  patch do
+    url "http://patchwork.ozlabs.org/patch/400328/raw/"
+    sha1 "0baca77c863e6876f6fb1838db9e5cb60c6fe89c"
+  end
+
+  # Patch to make regex BSD grep compatible. Can be removed when adopted upstream.
+  # http://patchwork.ozlabs.org/patch/400351/
+  patch do
+    url "http://patchwork.ozlabs.org/patch/400351/raw/"
+    sha1 "8f8e29aa149e65c2588a2d9ec3849d0ba727e0ad"
+  end
 
   def install
-    system "./configure", "--prefix=#{prefix}",
-                          "--exec-prefix=#{prefix}",
-                          "--with-objcopy=gobjcopy",
-                          "--with-objdump=gobjdump",
-                          "--with-readelf=greadelf",
-                          "--with-libtool=glibtool",
-                          "--with-libtoolize=glibtoolize",
-                          "--with-install=ginstall",
-                          "--with-sed=gsed",
-                          "--with-awk=gawk",
-                          "CFLAGS=-std=gnu89"
+    args = ["--prefix=#{prefix}",
+            "--exec-prefix=#{prefix}",
+            "--with-objcopy=gobjcopy",
+            "--with-objdump=gobjdump",
+            "--with-readelf=greadelf",
+            "--with-libtool=glibtool",
+            "--with-libtoolize=glibtoolize",
+            "--with-install=ginstall",
+            "--with-sed=gsed",
+            "--with-awk=gawk"]
+
+    args << "--with-grep=ggrep" if build.with? "grep"
+
+    args << "--with-make=gmake" if build.with? "make"
+
+    args << "CFLAGS=-std=gnu89"
+
+    system "./configure", *args
+
     # Must be done in two steps
     system "make"
     system "make install"
@@ -48,19 +69,3 @@ class CrosstoolNg < Formula
   end
 end
 
-__END__
-diff --git a/kconfig/zconf.gperf b/kconfig/zconf.gperf
-index c9e690e..21e79e4 100644
---- a/kconfig/zconf.gperf
-+++ b/kconfig/zconf.gperf
-@@ -7,6 +7,10 @@
- %pic
- %struct-type
-
-+%{
-+#include <stddef.h>
-+%}
-+
- struct kconf_id;
-
- static struct kconf_id *kconf_id_lookup(register const char *str, register unsigned int len);