mirror of
https://github.com/freebsd/freebsd-src
synced 2024-09-06 17:18:32 +00:00
1. Make the BSD version of cpio the default [1]
a. The BSD version will be built and installed unless WITHOUT_BSD_CPIO is defined. b. The GNU version will not be built or installed unless WITH_GNU_CPIO is defined. If this is defined, the symlink in /usr/bin will be to the GNU version whether the BSD version is present or not. When these changes are MFCed the defaults should be flipped. 2. Add a knob to disable the building of GNU grep. This will make it easier for those that want to test the BSD version in the ports. Approved by: kientzle [1]
This commit is contained in:
parent
076a71a21e
commit
6973701a00
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=179813
|
@ -5,7 +5,7 @@
|
|||
SUBDIR= bc \
|
||||
${_binutils} \
|
||||
${_cc} \
|
||||
cpio \
|
||||
${_cpio} \
|
||||
${_cvs} \
|
||||
dc \
|
||||
dialog \
|
||||
|
@ -13,7 +13,7 @@ SUBDIR= bc \
|
|||
diff3 \
|
||||
${_gdb} \
|
||||
${_gperf} \
|
||||
grep \
|
||||
${_grep} \
|
||||
${_groff} \
|
||||
${_man} \
|
||||
patch \
|
||||
|
@ -30,10 +30,18 @@ _groff= groff
|
|||
.endif
|
||||
.endif
|
||||
|
||||
.if ${MK_GNU_CPIO} == "yes"
|
||||
_cpio= cpio
|
||||
.endif
|
||||
|
||||
.if ${MK_CVS} != "no"
|
||||
_cvs= cvs
|
||||
.endif
|
||||
|
||||
.if ${MK_GNU_GREP} != "no"
|
||||
_grep= grep
|
||||
.endif
|
||||
|
||||
.if ${MK_MAN} != "no"
|
||||
_man= man
|
||||
.endif
|
||||
|
|
|
@ -62,9 +62,7 @@ CFLAGS+=-I${.OBJDIR} -I${.CURDIR} -I${CPIODIR}/lib -DHAVE_CONFIG_H \
|
|||
gcpio.1: ${CPIODIR}/doc/cpio.1
|
||||
cat ${CPIODIR}/doc/cpio.1 >gcpio.1
|
||||
|
||||
.if !defined(WITH_BSDCPIO)
|
||||
SYMLINKS=gcpio ${BINDIR}/cpio
|
||||
MLINKS=gcpio.1 cpio.1
|
||||
.endif
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
|
|
@ -287,6 +287,7 @@ WITH_IDEA=
|
|||
ATM \
|
||||
AUDIT \
|
||||
AUTHPF \
|
||||
BSD_CPIO \
|
||||
BIND \
|
||||
BIND_DNSSEC \
|
||||
BIND_ETC \
|
||||
|
@ -312,6 +313,7 @@ WITH_IDEA=
|
|||
GCOV \
|
||||
GDB \
|
||||
GNU \
|
||||
GNU_GREP \
|
||||
GPIB \
|
||||
GROFF \
|
||||
HTML \
|
||||
|
@ -374,6 +376,7 @@ MK_${var}:= yes
|
|||
#
|
||||
.for var in \
|
||||
BIND_LIBS \
|
||||
GNU_CPIO \
|
||||
HESIOD \
|
||||
IDEA
|
||||
.if defined(WITH_${var}) && defined(WITHOUT_${var})
|
||||
|
|
3
tools/build/options/WITHOUT_BSD_CPIO
Normal file
3
tools/build/options/WITHOUT_BSD_CPIO
Normal file
|
@ -0,0 +1,3 @@
|
|||
.\" $FreeBSD$
|
||||
Set to not build the BSD licensed version of cpio based on
|
||||
.Xr libarchive 3 .
|
2
tools/build/options/WITHOUT_GNU_GREP
Normal file
2
tools/build/options/WITHOUT_GNU_GREP
Normal file
|
@ -0,0 +1,2 @@
|
|||
.\" $FreeBSD$
|
||||
Set to not build GNU grep as a part of the base system.
|
6
tools/build/options/WITH_GNU_CPIO
Normal file
6
tools/build/options/WITH_GNU_CPIO
Normal file
|
@ -0,0 +1,6 @@
|
|||
.\" $FreeBSD$
|
||||
Set to build GNU cpio as a part of the base system,
|
||||
and symlink
|
||||
.Pa /usr/bin/cpio
|
||||
to this version.
|
||||
(This will override the symlink to the BSD version.)
|
|
@ -43,7 +43,7 @@ SUBDIR= alias \
|
|||
comm \
|
||||
compile_et \
|
||||
compress \
|
||||
cpio \
|
||||
${_cpio} \
|
||||
cpuset \
|
||||
csplit \
|
||||
${_csup} \
|
||||
|
@ -257,6 +257,10 @@ _nsupdate= nsupdate
|
|||
_bluetooth= bluetooth
|
||||
.endif
|
||||
|
||||
.if ${MK_BSD_CPIO} != "no"
|
||||
_cpio= cpio
|
||||
.endif
|
||||
|
||||
.if ${MK_CALENDAR} != "no"
|
||||
_calendar= calendar
|
||||
.endif
|
||||
|
|
|
@ -9,7 +9,7 @@ CFLAGS+= -DBSDCPIO_VERSION_STRING=\"${BSDCPIO_VERSION_STRING}\"
|
|||
CFLAGS+= -DPLATFORM_CONFIG_H=\"config_freebsd.h\"
|
||||
LDADD+= -larchive -lz -lbz2
|
||||
|
||||
.if defined(WITH_BSDCPIO)
|
||||
.if ${MK_GNU_CPIO} != "yes"
|
||||
SYMLINKS=bsdcpio ${BINDIR}/cpio
|
||||
MLINKS= bsdcpio.1 cpio.1
|
||||
.endif
|
||||
|
|
Loading…
Reference in a new issue