libcompat: avoid installing include files
ClosedPublic
Actions

Authored by emaste on Nov 16 2022, 10:04 PM.

Details

Reviewers

jrtc27
brooks
imp

Commits

rG227f47ce0c48: libcompat: avoid installing include files twice

Summary

Previously some headers were getting installed twice, once as expected
and again as part of the compat32 library stage.

Makefile.libcompat sets -DLIBRARIES_ONLY for the install make invocation
which causes bsd.lib.mk to skip headers.  However some headers are
handled via bsd.prog.mk, which does not use LIBRARIES_ONLY.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

emaste requested review of this revision.Nov 16 2022, 10:04 PM

emaste created this revision.

PR: 244596

@jrtc27 pointed out in IRC that we'll have similar issues with CONFS and FILES but this should at least be a start.

Using tools/pkgbase/metalog_reader.lua we can find a bunch of duplicated headers:

warning: ./usr/include/infiniband/arch.h repeated with same meta: line 11478,38405
warning: ./usr/include/infiniband/byteorder.h repeated with same meta: line 11473,38400
warning: ./usr/include/infiniband/byteswap.h repeated with same meta: line 11474,38401
warning: ./usr/include/infiniband/cm.h repeated with same meta: line 11494,38421
warning: ./usr/include/infiniband/cm_abi.h repeated with same meta: line 11495,38422
...

Seems reasonable. I'd probably put the addition on a separate line.

This revision is now accepted and ready to land.Nov 16 2022, 10:28 PM

Closed by commit rG227f47ce0c48: libcompat: avoid installing include files twice (authored by emaste). · Explain WhyNov 17 2022, 12:16 AM

This revision was automatically updated to reflect the committed changes.

emaste added a commit: rG227f47ce0c48: libcompat: avoid installing include files twice.