d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: remove the option to build gnugrep

Browse Source 
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
This commit is contained in:
Kyle Evans 2020-12-22 15:36:40 -06:00
parent eae35125e9
commit 8aff76fb37
13 changed files with 22 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ObsoleteFiles.inc
View File

@ -36,6 +36,20 @@
# xargs -n1 | sort | uniq -d; # xargs -n1 | sort | uniq -d;
# done # done
# 20201225: libregex removed
OLD_FILES+=usr/lib/libgnuregex.so
OLD_LIBS+=usr/lib/libgnuregex.so.5
OLD_FILES+=usr/lib/libgnuregex_p.a
OLD_FILES+=usr/include/gnu/posix/regex.h
OLD_DIRS+=usr/include/gnu/posix
OLD_FILES+=usr/include/gnu/regex.h
OLD_DIRS+=usr/include/gnu
OLD_FILES+=usr/include/gnuregex.h
# 20201225: gnugrep removed
OLD_FILES+=usr/bin/gnugrep
OLD_FILES+=usr/share/man/man1/gnugrep.1.gz
# 20201224: mk48txx(4) removed # 20201224: mk48txx(4) removed
OLD_FILES+=usr/share/man/man4/mk48txx.4.gz OLD_FILES+=usr/share/man/man4/mk48txx.4.gz

4
etc/mtree/BSD.include.dist
View File

@ -167,10 +167,6 @@
virstor virstor
.. ..
.. ..
gnu
posix
..
..
gssapi gssapi
.. ..
infiniband infiniband

4
gnu/lib/Makefile
View File

@ -6,10 +6,6 @@ SUBDIR=
SUBDIR.${MK_DIALOG}+= libdialog SUBDIR.${MK_DIALOG}+= libdialog
SUBDIR.${MK_TESTS}+= tests SUBDIR.${MK_TESTS}+= tests
.if ${MK_GNU_GREP} != "no"
SUBDIR+= libregex
.endif
SUBDIR_PARALLEL= SUBDIR_PARALLEL=
.include <bsd.subdir.mk> .include <bsd.subdir.mk>

1
gnu/usr.bin/Makefile
View File

@ -4,7 +4,6 @@
SUBDIR.${MK_DIALOG}+= dialog SUBDIR.${MK_DIALOG}+= dialog
SUBDIR.${MK_GNU_DIFF}+= diff3 SUBDIR.${MK_GNU_DIFF}+= diff3
SUBDIR.${MK_GNU_GREP}+= grep
SUBDIR.${MK_TESTS}+= tests SUBDIR.${MK_TESTS}+= tests
SUBDIR_PARALLEL= SUBDIR_PARALLEL=

1
share/mk/bsd.libnames.mk
View File

@ -67,7 +67,6 @@ LIBFL?= "don't use LIBFL, use LIBL"
LIBFORM?= ${LIBDESTDIR}${LIBDIR_BASE}/libform.a LIBFORM?= ${LIBDESTDIR}${LIBDIR_BASE}/libform.a
LIBG2C?= ${LIBDESTDIR}${LIBDIR_BASE}/libg2c.a LIBG2C?= ${LIBDESTDIR}${LIBDIR_BASE}/libg2c.a
LIBGEOM?= ${LIBDESTDIR}${LIBDIR_BASE}/libgeom.a LIBGEOM?= ${LIBDESTDIR}${LIBDIR_BASE}/libgeom.a
LIBGNUREGEX?= ${LIBDESTDIR}${LIBDIR_BASE}/libgnuregex.a
LIBGPIO?= ${LIBDESTDIR}${LIBDIR_BASE}/libgpio.a LIBGPIO?= ${LIBDESTDIR}${LIBDIR_BASE}/libgpio.a
LIBGSSAPI?= ${LIBDESTDIR}${LIBDIR_BASE}/libgssapi.a LIBGSSAPI?= ${LIBDESTDIR}${LIBDIR_BASE}/libgssapi.a
LIBGSSAPI_KRB5?= ${LIBDESTDIR}${LIBDIR_BASE}/libgssapi_krb5.a LIBGSSAPI_KRB5?= ${LIBDESTDIR}${LIBDIR_BASE}/libgssapi_krb5.a

2
share/mk/src.libnames.mk
View File

@ -117,7 +117,6 @@ _LIBRARIES= \
fetch \ fetch \
figpar \ figpar \
geom \ geom \
gnuregex \
gpio \ gpio \
gssapi \ gssapi \
gssapi_krb5 \ gssapi_krb5 \
@ -624,7 +623,6 @@ LIBOPENSMDIR= ${OBJTOP}/lib/ofed/libopensm
LIBOSMVENDORDIR=${OBJTOP}/lib/ofed/libvendor LIBOSMVENDORDIR=${OBJTOP}/lib/ofed/libvendor
LIBDIALOGDIR= ${OBJTOP}/gnu/lib/libdialog LIBDIALOGDIR= ${OBJTOP}/gnu/lib/libdialog
LIBGNUREGEXDIR= ${OBJTOP}/gnu/lib/libregex
LIBSSPDIR= ${OBJTOP}/lib/libssp LIBSSPDIR= ${OBJTOP}/lib/libssp
LIBSSP_NONSHAREDDIR= ${OBJTOP}/lib/libssp_nonshared LIBSSP_NONSHAREDDIR= ${OBJTOP}/lib/libssp_nonshared
LIBASN1DIR= ${OBJTOP}/kerberos5/lib/libasn1 LIBASN1DIR= ${OBJTOP}/kerberos5/lib/libasn1

2
share/mk/src.opts.mk
View File

@ -68,7 +68,6 @@ __DEFAULT_YES_OPTIONS = \
BOOTPARAMD \ BOOTPARAMD \
BOOTPD \ BOOTPD \
BSD_CPIO \ BSD_CPIO \
BSD_GREP \
BSDINSTALL \ BSDINSTALL \
BSNMP \ BSNMP \
BZIP2 \ BZIP2 \
@ -206,7 +205,6 @@ __DEFAULT_NO_OPTIONS = \
CLANG_FORMAT \ CLANG_FORMAT \
DTRACE_TESTS \ DTRACE_TESTS \
EXPERIMENTAL \ EXPERIMENTAL \
GNU_GREP \
HESIOD \ HESIOD \
LIBSOFT \ LIBSOFT \
LOADER_FIREWIRE \ LOADER_FIREWIRE \

26
tools/build/mk/OptionalObsoleteFiles.inc
View File

@ -2312,31 +2312,6 @@ OLD_FILES+=usr/bin/diff3
OLD_FILES+=usr/share/man/man1/diff3.1.gz OLD_FILES+=usr/share/man/man1/diff3.1.gz
.endif .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 .if ${MK_GSSAPI} == no
OLD_FILES+=usr/include/gssapi/gssapi.h OLD_FILES+=usr/include/gssapi/gssapi.h
OLD_DIRS+=usr/include/gssapi 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_eh_p.a
OLD_FILES+=usr/lib/libgcc_p.a OLD_FILES+=usr/lib/libgcc_p.a
OLD_FILES+=usr/lib/libgeom_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/libgpio_p.a
OLD_FILES+=usr/lib/libgssapi_krb5_p.a OLD_FILES+=usr/lib/libgssapi_krb5_p.a
OLD_FILES+=usr/lib/libgssapi_ntlm_p.a OLD_FILES+=usr/lib/libgssapi_ntlm_p.a

2
tools/build/options/WITHOUT_BSD_GREP
View File

@ -1,2 +0,0 @@
.\" $FreeBSD$
Install GNU grep as '[ef]grep' instead of BSD grep.

3
tools/build/options/WITHOUT_GNU_GREP
View File

@ -1,3 +0,0 @@
.\" $FreeBSD$
Set to not build GNU
.Xr grep 1 .

2
tools/build/options/WITH_BSD_GREP
View File

@ -1,2 +0,0 @@
.\" $FreeBSD$
Install BSD-licensed grep as '[ef]grep' instead of GNU grep.

3
tools/build/options/WITH_GNU_GREP
View File

@ -1,3 +0,0 @@
.\" $FreeBSD$
Build and install GNU
.Xr grep 1 .

26
usr.bin/grep/Makefile
View File

@ -4,17 +4,9 @@
.include <src.opts.mk> .include <src.opts.mk>
.if ${MK_BSD_GREP} == "yes" || defined(BOOTSTRAPPING)
PROG= grep PROG= grep
MAN1= grep.1 zgrep.1 MAN1= grep.1 zgrep.1
.else
PROG= bsdgrep
CLEANFILES+= bsdgrep.1
MAN1= bsdgrep.1 zgrep.1
bsdgrep.1: grep.1
${CP} ${.ALLSRC} ${.TARGET}
.endif
SRCS= file.c grep.c queue.c util.c SRCS= file.c grep.c queue.c util.c
SCRIPTS= zgrep.sh SCRIPTS= zgrep.sh
@ -33,6 +25,10 @@ LINKS= ${BINDIR}/zgrep ${BINDIR}/zfgrep \
${BINDIR}/zgrep ${BINDIR}/zstdegrep \ ${BINDIR}/zgrep ${BINDIR}/zstdegrep \
${BINDIR}/zgrep ${BINDIR}/zstdegrep ${BINDIR}/zgrep ${BINDIR}/zstdegrep
LINKS+= ${BINDIR}/grep ${BINDIR}/egrep \
${BINDIR}/grep ${BINDIR}/fgrep \
${BINDIR}/grep ${BINDIR}/rgrep \
MLINKS= zgrep.1 zfgrep.1 \ MLINKS= zgrep.1 zfgrep.1 \
zgrep.1 zegrep.1 \ zgrep.1 zegrep.1 \
zgrep.1 bzgrep.1 \ zgrep.1 bzgrep.1 \
@ -48,18 +44,12 @@ MLINKS= zgrep.1 zfgrep.1 \
zgrep.1 zstdegrep.1 \ zgrep.1 zstdegrep.1 \
zgrep.1 zstdfgrep.1 zgrep.1 zstdfgrep.1
MLINKS+= grep.1 egrep.1 \
grep.1 fgrep.1 \
grep.1 rgrep.1
CFLAGS.gcc+= --param max-inline-insns-single=500 CFLAGS.gcc+= --param max-inline-insns-single=500
.if ${MK_BSD_GREP} == "yes" || defined(BOOTSTRAPPING)
LINKS+= ${BINDIR}/grep ${BINDIR}/egrep \
${BINDIR}/grep ${BINDIR}/fgrep \
${BINDIR}/grep ${BINDIR}/rgrep \
MLINKS+= grep.1 egrep.1 \
grep.1 fgrep.1 \
grep.1 rgrep.1
.endif
.if !defined(BOOTSTRAPPING) .if !defined(BOOTSTRAPPING)
LIBADD+= regex LIBADD+= regex
.endif .endif