aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorKyle Evans <kevans@FreeBSD.org>2020-12-22 21:36:40 +0000
committerKyle Evans <kevans@FreeBSD.org>2020-12-25 21:14:17 +0000
commit8aff76fb37b58a74832831ac1c54a013a64b35e7 (patch)
tree01f33cd6fb92aa9afc82f4a9ded361772c208ad9 /tools
parenteae35125e948b2d92d3ba1d9687cb08086393ae8 (diff)
downloadsrc-8aff76fb37b58a74832831ac1c54a013a64b35e7.tar.gz
src-8aff76fb37b58a74832831ac1c54a013a64b35e7.zip
build: remove the option to build gnugrep
Unconditionally install bsdgrep as grep, bootstrap or not. Remove all build glue and stop installing both gnugrep and libgnuregex now that all consumers of the latter are gone. Relnotes: yes Differential Revision: https://reviews.freebsd.org/D27732
Diffstat (limited to 'tools')
-rw-r--r--tools/build/mk/OptionalObsoleteFiles.inc26
-rw-r--r--tools/build/options/WITHOUT_BSD_GREP2
-rw-r--r--tools/build/options/WITHOUT_GNU_GREP3
-rw-r--r--tools/build/options/WITH_BSD_GREP2
-rw-r--r--tools/build/options/WITH_GNU_GREP3
5 files changed, 0 insertions, 36 deletions
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index a3e353e5574b..2c554f5f58c3 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -2312,31 +2312,6 @@ OLD_FILES+=usr/bin/diff3
OLD_FILES+=usr/share/man/man1/diff3.1.gz
.endif
-.if ${MK_GNU_GREP} == no
-OLD_FILES+=usr/bin/gnugrep
-OLD_FILES+=usr/share/man/man1/gnugrep.1.gz
-.if ${MK_BSD_GREP} == no
-OLD_FILES+=usr/bin/bzgrep
-OLD_FILES+=usr/bin/bzegrep
-OLD_FILES+=usr/bin/bzfgrep
-OLD_FILES+=usr/bin/egrep
-OLD_FILES+=usr/bin/fgrep
-OLD_FILES+=usr/bin/grep
-OLD_FILES+=usr/bin/zegrep
-OLD_FILES+=usr/bin/zfgrep
-OLD_FILES+=usr/bin/zgrep
-OLD_FILES+=usr/share/man/man1/bzegrep.1.gz
-OLD_FILES+=usr/share/man/man1/bzfgrep.1.gz
-OLD_FILES+=usr/share/man/man1/bzgrep.1.gz
-OLD_FILES+=usr/share/man/man1/egrep.1.gz
-OLD_FILES+=usr/share/man/man1/fgrep.1.gz
-OLD_FILES+=usr/share/man/man1/grep.1.gz
-OLD_FILES+=usr/share/man/man1/zegrep.1.gz
-OLD_FILES+=usr/share/man/man1/zfgrep.1.gz
-OLD_FILES+=usr/share/man/man1/zgrep.1.gz
-.endif
-.endif
-
.if ${MK_GSSAPI} == no
OLD_FILES+=usr/include/gssapi/gssapi.h
OLD_DIRS+=usr/include/gssapi
@@ -7440,7 +7415,6 @@ OLD_FILES+=usr/lib/libformw_p.a
OLD_FILES+=usr/lib/libgcc_eh_p.a
OLD_FILES+=usr/lib/libgcc_p.a
OLD_FILES+=usr/lib/libgeom_p.a
-OLD_FILES+=usr/lib/libgnuregex_p.a
OLD_FILES+=usr/lib/libgpio_p.a
OLD_FILES+=usr/lib/libgssapi_krb5_p.a
OLD_FILES+=usr/lib/libgssapi_ntlm_p.a
diff --git a/tools/build/options/WITHOUT_BSD_GREP b/tools/build/options/WITHOUT_BSD_GREP
deleted file mode 100644
index b598d8aca012..000000000000
--- a/tools/build/options/WITHOUT_BSD_GREP
+++ /dev/null
@@ -1,2 +0,0 @@
-.\" $FreeBSD$
-Install GNU grep as '[ef]grep' instead of BSD grep.
diff --git a/tools/build/options/WITHOUT_GNU_GREP b/tools/build/options/WITHOUT_GNU_GREP
deleted file mode 100644
index 1bb7d4a53eba..000000000000
--- a/tools/build/options/WITHOUT_GNU_GREP
+++ /dev/null
@@ -1,3 +0,0 @@
-.\" $FreeBSD$
-Set to not build GNU
-.Xr grep 1 .
diff --git a/tools/build/options/WITH_BSD_GREP b/tools/build/options/WITH_BSD_GREP
deleted file mode 100644
index e6641173e2d1..000000000000
--- a/tools/build/options/WITH_BSD_GREP
+++ /dev/null
@@ -1,2 +0,0 @@
-.\" $FreeBSD$
-Install BSD-licensed grep as '[ef]grep' instead of GNU grep.
diff --git a/tools/build/options/WITH_GNU_GREP b/tools/build/options/WITH_GNU_GREP
deleted file mode 100644
index 1d19a7df092c..000000000000
--- a/tools/build/options/WITH_GNU_GREP
+++ /dev/null
@@ -1,3 +0,0 @@
-.\" $FreeBSD$
-Build and install GNU
-.Xr grep 1 .