Page MenuHomeFreeBSD
Differential D40571

Generalise libcompat to be a list rather than a single option
ClosedPublic
Actions

Authored by jrtc27 on Jun 15 2023, 9:56 PM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Mar 19, 3:34 AM
Unknown Object (File)
Wed, Mar 18, 9:36 PM
Unknown Object (File)
Wed, Mar 18, 11:02 AM
Unknown Object (File)
Wed, Mar 18, 6:18 AM
Unknown Object (File)
Mon, Mar 16, 8:59 AM
Unknown Object (File)
Sun, Mar 15, 1:28 PM
Unknown Object (File)
Wed, Mar 4, 11:54 AM
Unknown Object (File)
Tue, Mar 3, 9:33 PM
View All Files
Subscribers
bdrewery
• karels

Details

Reviewers
brooks
jhb
imp
emaste
Commits
rG91d7edd549f5: Generalise libcompat to be a list rather than a single option
Summary

Whilst the kernel can support any number of COMPAT_FOO, world can only
build a single libfoo. Upstream this isn't such an issue, since the only
option is lib32 anyway, but downstreams, such as CheriBSD, may wish to
support multiple at the same time. Thus, adjust the top-level Makefiles
to turn _LIBCOMPAT into a _LIBCOMPATS list that gets iterated over, and
adjust bsd.compat.mk to support this use-case.

For the normal NEED_COMPAT/WANT_COMPAT case, LIBCOMPATFOO remain set and
refer to the requested compat's, preserving the current interface. For
the top-level Makefiles those variables are no longer set (since there
is no longer "the" compat) and only the per-compat ones are available.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 52090
Build 48981: arc lint + arc unit

Event Timeline

jrtc27 created this revision.Jun 15 2023, 9:56 PM
Herald added a subscriber: bdrewery. · View Herald TranscriptJun 15 2023, 9:56 PM
jrtc27 requested review of this revision.Jun 15 2023, 9:56 PM
Harbormaster completed remote builds in B52090: Diff 123302.Jun 15 2023, 9:56 PM
jrtc27 added a parent revision: D40570: Makefile.libcompat: Handle MK_FOO varying for native and compat arches.Jun 15 2023, 9:56 PM
imp added inline comments.Jun 16 2023, 12:53 AM
Makefile.inc1
854

How do others get added?

1184

Where does through lowercase version of this get set?

jrtc27 added inline comments.Jun 16 2023, 1:02 AM
Makefile.inc1
854
.if ${MK_LIB64} == "yes"
_LIBCOMPATS+=	64
.endif

etc; I actually tested this by adding a (pointless) lib64 to amd64 in https://github.com/jrtc27/freebsd-src/commit/b5123f22133f09451edd04ef1a3fca4ff2feb547

1184

Line 107 of bsd.compat.mk (akin to how line 102 used to set libcompat singular)

brooks accepted this revision.Jun 16 2023, 5:43 PM
This revision is now accepted and ready to land.Jun 16 2023, 5:43 PM
jhb accepted this revision.Jun 16 2023, 11:41 PM

That is less painful than I thought it was going to be.

jrtc27 updated this revision to Diff 123425.Jun 19 2023, 3:26 PM
  • Fix build for compat-less arches
  • Fix WMAKE_TGTS filtering, including for universe-toolchain

(tinderbox now succeeds)

This revision now requires review to proceed.Jun 19 2023, 3:26 PM
Harbormaster completed remote builds in B52136: Diff 123425.Jun 19 2023, 3:26 PM
jrtc27 added a comment.Jun 24 2023, 7:46 PM

Ping for the updated diff?

imp accepted this revision.Jun 24 2023, 9:39 PM

My questions are answered. Don't see anything else noteworthy

This revision is now accepted and ready to land.Jun 24 2023, 9:39 PM
brooks accepted this revision.Jun 26 2023, 6:34 PM
Closed by commit rG91d7edd549f5: Generalise libcompat to be a list rather than a single option (authored by jrtc27). · Explain WhyJun 27 2023, 11:12 PM
This revision was automatically updated to reflect the committed changes.
jrtc27 added a commit: rG91d7edd549f5: Generalise libcompat to be a list rather than a single option.

Revision Contents
Changeset List

PathSize
39 lines
29 lines
share/
mk/
69 lines

Diff 123302

View Options

Makefile.inc1

Loading...
View Options

Makefile.libcompat

Loading...
View Options

share/mk/bsd.compat.mk

Loading...