| 1.2 |
| 11-Jul-2024 |
riastradh | Revert the duplication of compat set lists; do it another way.
1. Restore the compatdir and compatfile tags in base and debug.
=> compatdir marks directories that should have per-ABI compat
subdirectories, like /usr/lib having /usr/lib/o32 and
/usr/lib/64 on mips64.
=> compatfile marks files that have per-ABI versions in the
nearest compatdir, like /usr/lib/o32/libc.so.12.221.
This is the mechanism we use to avoid duplicating every library
that has a compat version in multiple set lists.
2. Teach sets.subr to split the compatdir and compatfile entries out
into separate sets for base and debug.
The mechanism is to internally use:
- a new tag `omitcompat' when processing base and debug, so we
don't generate the per-ABI compat directories or per-ABI compat
files under them;
- a new tag `takecompat=${ABI}' when processing base32/64 and
debug32/64, so we _do_ generate the per-ABI compat directories
for ${ABI}.
=> On, e.g., mips64, base32 uses `takecompat=o32' and base64
uses `takecompat=64'.
=> On, e.g., aarch64, base32 uses
`takecompat=eabi,takecompat=eabihf', and there is no base64.
3. Record in sets.subr the list of `32' and `64' architectures for
each port.
This is maybe not the right place to put it, but it's also not
clear that we want to keep exactly this division -- maybe it would
be more sensible to just have per-ABI , e.g.:
(aarch64) base-eabi, base-eabihf
(amd64) base-i386
(mips64) base-o32, base-64
(mipsn64) base-o32, base-n32
But I'll leave cleaning that up for another day.
4. Adjust some sets. Mostly this commit shouldn't change what file
go in what sets, but, e.g., on mips64, the following move from
base32 to base64 as part of this change, which I think is
appropriate:
- /lib/64
- /libexec/ld.elf_so-64
- /usr/lib/64
- /usr/libdata/debug/lib/64
- /usr/libdata/debug/usr/lib/64
- /usr/libexec/ld.elf_so-64
TBD: Remove ./lib and ./usr/lib from debug/mi; they're already in
base/mi. Maybe move ./usr/libdata/debug to from base/mi to debug/mi.
This reverts most of the set list changes in:
https://mail-index.netbsd.org/source-changes/2024/04/09/msg150763.html
PR misc/58365
|
