All the strictly non-meta mode changes are in head,
this diff is the basic infra for meta mode in a "do no harm" form.
Ie. buildworld works as it always has.
A separate diff will show the initial targets hierarchy
Details
Details
- Reviewers
brooks imp - Commits
- rS284345: Add META_MODE support.
Diff Detail
Diff Detail
- Lint
Lint Skipped - Unit
Tests Skipped
Event Timeline
Comment Actions
Some comments on the changes to existing files. Will review the the new files tomorrow
| etc/Makefile | ||
|---|---|---|
| 333 | We've used 'MK_* != "no"' historically, but for new code 'MK_* == "yes"' is easier to read and Warner made a change to make yes and no be the only possible values. | |
| include/Makefile | ||
| 131 | .if ${MK_STAGING} == "yes" | |
| include/arpa/Makefile | ||
| 6–7 | Is this intentional? I remember telnet.h is weird, but don't remember why. | |
| kerberos5/lib/libhx509/Makefile | ||
| 303 | extra line? | |
| lib/clang/clang.build.mk | ||
| 42 | left over debug output? | |
| lib/libpam/static_modules/Makefile | ||
| 44 | where does openpam_static.c come from? | |
| lib/ncurses/ncurses/Makefile | ||
| 311 | Is this and ENABLE_WIDEC redundant? | |
| share/mk/bsd.crunchgen.mk | ||
| 109 ↗ | (On Diff #6143) | this change looks like it could be separate from meta_mode. |
| lib/clang/clang.build.mk | ||
|---|---|---|
| 42 | Yes, removed. | |
| lib/libpam/static_modules/Makefile | ||
| 44 | contrib/libpam | |
| lib/ncurses/ncurses/Makefile | ||
| 311 | I'm not sure actually, the test above is to avoid ncurses and ncursesw | |
| share/mk/bsd.crunchgen.mk | ||
| 109 ↗ | (On Diff #6143) | Sure |
Comment Actions
OK, so there's a bunch of nit-picky comments, but generally I like this.
| Makefile | ||
|---|---|---|
| 106 | I'd be tempted to have a .include "Makefile.classic" for the classic buildworld goo. But maybe in a separate commit to show how you've changed things before moving it. Not a huge priority, but just a suggestion... | |
| include/Makefile | ||
| 169 | Why do we need to do this here, and elsewhere? Perhaps a quick comment would be helpful since it's done in two places... | |
| 378 | Are the new MACHINE types like this used in meta mode? Or is that something that is a separate feature? | |
| lib/libc/Makefile | ||
| 171 | Since we're already invoking make to have msun tell us the arch, perhaps it can tell it to us in a way we don't need the following crazy .if? | |
| lib/libpam/libpam/Makefile | ||
| 179 | This is fine for now, but I've half way been considering automatically include src.opts.mk inside of src.sys.mk which is included from local.sys.mk from sys.mk. Have you considered this? | |
| lib/libpam/static_modules/Makefile | ||
| 2 | Silly not: We normally use earliest-latest rather than listing the years. And 2015 since it is being published this year. | |
| 46–47 | Do these two things still do anything? MAN= I think is the new way for NO_MAN. | |
| share/mk/dirdeps.mk | ||
| 609 | I'm shocked that you have no Douglas Adams references here. "Oh no. Not again." suggests itself. | |
| share/mk/host-target.mk | ||
| 15 | move this up a line... | |
| share/mk/local.dirdeps.mk | ||
| 5 | This could go away if the earlier suggesting is followed. Also, why isn't this src.dirdeps.mk? | |
| share/mk/local.sys.mk | ||
| 1 | How do I know what to put here, and what to put in src.sys.mk? | |
| share/mk/sys.mk | ||
| 353–362 | Why is this here, and not in src.sys.mk? | |
| lib/libpam/libpam/Makefile | ||
|---|---|---|
| 179 | That sounds like a good idea. | |
| share/mk/host-target.mk | ||
| 15 | The comment is explaining why the next line is needed | |
| share/mk/local.dirdeps.mk | ||
| 5 | Yes, including src.opts.mk from src.sys.mk would be good change. | |
| share/mk/local.sys.mk | ||
| 1 | This is generic stuff that others might want to use (ie by copying this to their own tree) | |
| share/mk/sys.mk | ||
| 353–362 | Because the idea is to allow others (not just src/) to be able to use these. | |
Comment Actions
So including local.sys.mk earlier works fine, and allows us to easily hook in external toolchain ok
But src.opts.mk cannot be included that early since it includes bsd.compiler.mk which needs the compiler selected.
So src.opts.mk could be included from sys.mk but should be done later.