bsdgrep: switch to libregex for GNU_GREP_COMPAT
libregex is incomplete, but it's a bit less buggy than the in-base libgnuregex and mostly OK. While here, rename -DIWTH_GNU -> -DWITH_GNU_COMPAT; the option implies that we're compatible with the GNU counterpart, not that we're including GNU anything.
This commit is contained in:
parent
1546dc216f
commit
cab7d341dc
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=363823
@ -61,8 +61,8 @@ MLINKS+= grep.1 egrep.1 \
|
|||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_GNU_GREP_COMPAT} != "no"
|
.if ${MK_GNU_GREP_COMPAT} != "no"
|
||||||
CFLAGS+= -I${SYSROOT:U${DESTDIR}}/usr/include/gnu -DWITH_GNU
|
CFLAGS+= -DWITH_GNU_COMPAT
|
||||||
LIBADD+= gnuregex
|
LIBADD+= regex
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
HAS_TESTS=
|
HAS_TESTS=
|
||||||
|
@ -555,7 +555,7 @@ main(int argc, char *argv[])
|
|||||||
filebehave = FILE_MMAP;
|
filebehave = FILE_MMAP;
|
||||||
break;
|
break;
|
||||||
case 'V':
|
case 'V':
|
||||||
#ifdef WITH_GNU
|
#ifdef WITH_GNU_COMPAT
|
||||||
printf(errstr[9], getprogname(), VERSION);
|
printf(errstr[9], getprogname(), VERSION);
|
||||||
#else
|
#else
|
||||||
printf(errstr[8], getprogname(), VERSION);
|
printf(errstr[8], getprogname(), VERSION);
|
||||||
|
Loading…
Reference in New Issue
Block a user