FreeBSD/src
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2026-06-02 11:24:32 +00:00
Code Issues Projects Releases Wiki Activity

Build BSD diff3 if GNU diff3 is disabled.

Browse Source 
MFC after:	3 weeks
Sponsored by:	Klara, Inc.
Reviewed by:	kevans
Differential Revision:	https://reviews.freebsd.org/D46799
This commit is contained in:
Dag-Erling Smørgrav
2024-10-02 17:54:53 +02:00
parent 4e859e67dd
commit 2201f7c49f
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/build/mk/OptionalObsoleteFiles.inc
-5
View File
@@ -2073,11 +2073,6 @@ OLD_FILES+=usr/tests/usr.bin/dc/inout
OLD_DIRS+=usr/tests/usr.bin/dc
.endif
.if ${MK_GNU_DIFF} == no
OLD_FILES+=usr/bin/diff3
OLD_FILES+=usr/share/man/man1/diff3.1.gz
.endif
.if ${MK_GOOGLETEST} == no
OLD_FILES+=usr/include/private/gmock/gmock-actions.h
OLD_FILES+=usr/include/private/gmock/gmock-cardinalities.h
tools/build/options/WITHOUT_GNU_DIFF
+4 -1
View File
@@ -1,2 +1,5 @@
Do not build GNU
.Xr diff3 1 .
.Xr diff3 1 ;
build BSD
.Xr diff3 1
instead.
tools/build/options/WITH_GNU_DIFF
+2
View File
@@ -1,2 +1,4 @@
Build and install GNU
.Xr diff3 1
instead of BSD
.Xr diff3 1 .
usr.bin/Makefile
+3
View File
@@ -212,6 +212,9 @@ SUBDIR+= gh-bc
SUBDIR.${MK_OPENSSL}+= bc
SUBDIR.${MK_OPENSSL}+= dc
.endif
.if ${MK_GNU_DIFF} == "no"
SUBDIR+= diff3
.endif
SUBDIR.${MK_HESIOD}+= hesinfo
SUBDIR.${MK_ICONV}+= iconv
SUBDIR.${MK_ICONV}+= mkcsmapper