svn commit: r368392 - head/usr.bin/grep

Kyle Evans kevans at FreeBSD.org
Sun Dec 6 17:45:42 UTC 2020


Author: kevans
Date: Sun Dec  6 17:45:42 2020
New Revision: 368392
URL: https://svnweb.freebsd.org/changeset/base/368392

Log:
  bsdgrep: don't link against libregex for bootstrap
  
  r368355 removed the GNU_GREP_COMPAT knob (off by default) and forgot that
  bsdgrep may be built/used for bootstrap on some systems.
  
  All base uses should strive to use only POSIX-compliant expressions anyways
  and we haven't had libregex by default here up to this point, so just don't
  do that if we're bootstrapping.
  
  Note that the resulting binary has the wrong `grep -V` information as it
  falsely claims to be GNU compatible, but it is only for bootstrap.
  
  Reported by:	GitHub cross-builds via yuripv

Modified:
  head/usr.bin/grep/Makefile

Modified: head/usr.bin/grep/Makefile
==============================================================================
--- head/usr.bin/grep/Makefile	Sun Dec  6 17:44:28 2020	(r368391)
+++ head/usr.bin/grep/Makefile	Sun Dec  6 17:45:42 2020	(r368392)
@@ -60,7 +60,9 @@ MLINKS+= grep.1 egrep.1 \
 	grep.1 rgrep.1
 .endif
 
+.if !defined(BOOTSTRAPPING)
 LIBADD+=	regex
+.endif
 
 HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests


More information about the svn-src-all mailing list