Simplify and speed up the kyua build
ClosedPublic
Actions

Authored by arichardson on Jun 30 2021, 5:49 PM.

Details

Reviewers

brooks

Group Reviewers

tests

Commits

rG22548a3b8070: Simplify and speed up the kyua build
rG2eb9ad427475: Simplify and speed up the kyua build

Summary

Instead of having multiple kyua libraries, just include the files as part
of usr.bin/kyua. Previously, we would build each kyua source up to four
times: once as a .o file and once as a .pieo. Additionally, the kyua
libraries might be built again for compat32. As all the kyua libraries
amount to 102 C++ sources the build time is significant (especially when
using an assertions enabled compiler).

Test Plan

still compiles

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 40230
Build 37119: arc lint + arc unit

Event Timeline

arichardson created this revision.Jun 30 2021, 5:49 PM

Herald added subscribers: emaste, imp, bdrewery. · View Herald TranscriptJun 30 2021, 5:49 PM

arichardson requested review of this revision.Jun 30 2021, 5:49 PM

Harbormaster completed remote builds in B40194: Diff 91578.Jun 30 2021, 5:49 PM

jrtc27 added a subscriber: jrtc27.Jun 30 2021, 5:54 PM

jrtc27 added inline comments.

usr.bin/kyua/store/Makefile.inc
1–2 ↗	(On Diff #91578)	Do you really want this and the one in utils?

drop old .PATH

Harbormaster completed remote builds in B40195: Diff 91579.Jun 30 2021, 5:56 PM

arichardson added inline comments.Jun 30 2021, 5:56 PM

usr.bin/kyua/store/Makefile.inc
1–2 ↗	(On Diff #91578)	Forgot to delete these two after prefixing all source files with <lib>/ (to resolve the name conflicts)

I guess we could also merge */Makefile.inc to the main makefile, but this change was simpler

In D30967#696806, @arichardson wrote:

I guess we could also merge */Makefile.inc to the main makefile, but this change was simpler

I tend to think they should be merged into the main makefile, but probably with per-library SRCS+= lines to ease updating if new files are added upstream. I don't feel all that strongly though.

This revision is now accepted and ready to land.Jul 1 2021, 5:43 PM

merge into main makefile

This revision now requires review to proceed.Jul 2 2021, 8:19 AM

Harbormaster completed remote builds in B40230: Diff 91651.Jul 2 2021, 8:19 AM

This revision was not accepted when it landed; it landed in state Needs Review.Jul 2 2021, 8:29 AM

Closed by commit rG2eb9ad427475: Simplify and speed up the kyua build (authored by arichardson). · Explain Why

This revision was automatically updated to reflect the committed changes.

arichardson added a commit: rG2eb9ad427475: Simplify and speed up the kyua build.

arichardson added a commit: rG22548a3b8070: Simplify and speed up the kyua build.Aug 5 2021, 9:26 AM