The patch as is should work fine.
Though it is obviously a little confusing why we have both beforedepend and beforebuild dependencies.
You *could* put offset.inc and assym.inc into a list (naming the list is the hard bit ;-)

I was hoping you'd know why both were needed, since we have in bsd.dep.mk:

I was going to say don't make beforebuild depend on depend

.NOPATH is usually a good idea for CLEANFILES etc

Keep ALL_MACHINE_LIST in local.sys.dirdeps.env.mk

Set _PARSEDIR earlier

Update sys.dirdeps.mk

Didn't have latest sys.dirdeps.mk

Seems reasonable

ok

Use BROKEN_OPTIONS for TESTS

Disable MK_TESTS in src.opts.mk when appropriate

Do not block target tests of tar when building on non-FreeBSD

Add includes.h to include/linux

Get _PATH_TTY from paths.h

Add readpassphrase to libegacy to avoid libbsd

Excise tar makefile

Drop libarchive and tar for now

Lose tar bits for now

Move some common bits of non-FreeBSD handling out of src.init.linux.mk

Remove -D__unused no longer needed.

We only need -D_GNU_SOURCE

Fix grammar in comment

Make src.init.linux.mk mimic what buildworld does wrt -Is

Reduce to minimal change

Again, the non-dirdeps build depend on side effects of multiple targets - it doesn't even *have* a standalone target to build any of this.

But you should make sure to use the same set of headers, compatibility files and compiler flags, then you won't need any changes to source files, just dirdeps build system bits to arrange things to match. The fact that you have to make changes to them points at the dirdeps environment being fundamentally different in ways that it shouldn't be.

In D39751#904733, @jrtc27 wrote:

Why are any of these tools/build/cross-build changes needed? Non-dirdeps does not need these. Fix your dirdeps build to match that case.

Add comments to linux sys/_types.h

mkimg needs Makefile.depend.options to get libegacy

Ensure sys/types.h included before err.h and we don't have issue with va_list

Stage common sys/_types.h too

The changes in makefs have been discarded, there are only 2 changes outside of tools/build/ contrib/mtree uses HAVE_STRUCT_STAT_ST_FLAGS in a manner inconsistent with elsewhere (where the value matters) the changes are harmless

Ok, but you really should be getting things like __va_list from tools/build/cross-build/include/common/sys/_types.h. We don't want two ways of doing the same thing in-tree (and it's in your own best interest, too, longer term, since it means whenever someone works on the non-dirdeps build to add or fix something you'll also get the fix, rather than having to rediscover it yourself).

In D39744#904679, @jrtc27 wrote:

In D39744#904676, @sjg wrote:

In D39744#904675, @jrtc27 wrote:

In D39744#904672, @sjg wrote:

In D39744#904652, @jrtc27 wrote:

I don’t understand why you need these hacks for makefs and mkimg when they already build just fine in the non-dirdeps case.

I don't either, but the non-dirdeps build is impossible to decompose in any sensible manner, it depends on side effects of tree walks etc.

Ok, but I would much prefer the two builds use the same approach. Having divergence in the compatibility headers / source files / etc will lead to madness.

I don't disagree, but I don't see that being possible. None of these changes are harmful to the non-dirdeps build.

These ones don't touch it, but you had various diffs to the C sources for base programs that are harmful to anything but the dirdeps-on-non-freebsd build; we've tried hard to limit the diffs to base sources and contain it in build system changes and tools/build/cross-build compatibility bits.

In D39744#904675, @jrtc27 wrote:

In D39744#904672, @sjg wrote:

In D39744#904652, @jrtc27 wrote:

I don’t understand why you need these hacks for makefs and mkimg when they already build just fine in the non-dirdeps case.

I don't either, but the non-dirdeps build is impossible to decompose in any sensible manner, it depends on side effects of tree walks etc.

Ok, but I would much prefer the two builds use the same approach. Having divergence in the compatibility headers / source files / etc will lead to madness.

In D39744#904652, @jrtc27 wrote:

I don’t understand why you need these hacks for makefs and mkimg when they already build just fine in the non-dirdeps case.

We are unlikely to be using host32 on FreeBSD

Address some feedback

We no longer need HAVE_STRUCT_DINODE_DI_SHORTLINK

FWIW None of these changes affect targets like buildworld,

Need pseudo option for building on older or non-FreeBSD hosts
so we build libegacy (tools/build)