Differential D46799

Build BSD diff3 if GNU diff3 is disabled.
ClosedPublic
Actions

Authored by des on Sep 26 2024, 9:30 PM.

Tags

None

Referenced Files

	Unknown Object (File)
	Tue, Aug 5, 12:37 AM

	Unknown Object (File)
	Jul 7 2025, 7:58 PM

	Unknown Object (File)
	Jul 6 2025, 5:00 PM

	Unknown Object (File)
	Jul 5 2025, 6:02 AM

	Unknown Object (File)
	Jul 4 2025, 1:30 PM

	Unknown Object (File)
	Jul 3 2025, 8:36 PM

	Unknown Object (File)
	Jul 3 2025, 10:03 AM

	Unknown Object (File)
	Jul 2 2025, 11:58 AM

View All 41 Files

Subscribers

Details

Reviewers

thj
bapt
kevans

Group Reviewers

Commits

rG2201f7c49f11: Build BSD diff3 if GNU diff3 is disabled.

Summary

MFC after: 3 weeks
Sponsored by: Klara, Inc.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

des created this revision.Sep 26 2024, 9:30 PM

Herald added a subscriber: imp. · View Herald TranscriptSep 26 2024, 9:30 PM

des requested review of this revision.Sep 26 2024, 9:30 PM

Harbormaster completed remote builds in B59608: Diff 143766.Sep 26 2024, 9:30 PM

kevans accepted this revision.Sep 27 2024, 12:31 AM

This revision is now accepted and ready to land.Sep 27 2024, 12:31 AM

While this review is ok I think we can only enable it when the etcupdate testsuite passes without error which is not the case yet, I 3 tests gnu diff3 manage to merge while bsd diff3 considers conflits: always_test:main, fbsdid_test:main, preworld_test:main, tests_test:main

@bapt thank you for the test cases, this gives me something to work towards.

Closed by commit rG2201f7c49f11: Build BSD diff3 if GNU diff3 is disabled. (authored by des). · Explain WhyOct 2 2024, 3:56 PM

This revision was automatically updated to reflect the committed changes.

des added a commit: rG2201f7c49f11: Build BSD diff3 if GNU diff3 is disabled..

emaste mentioned this in D46878: Retire GNU diff3.Oct 2 2024, 4:40 PM

Revision Contents
Changeset List

Path

Size

tools/

build/

mk/

OptionalObsoleteFiles.inc

5 lines

options/

WITHOUT_GNU_DIFF

5 lines

2 lines

usr.bin/

3 lines

Diff 144129

tools/build/mk/OptionalObsoleteFiles.inc

Loading...

tools/build/options/WITHOUT_GNU_DIFF

Loading...

tools/build/options/WITH_GNU_DIFF

Loading...

usr.bin/Makefile

Loading...