Update dirdeps.mk and gendirdeps.mk

[sjg]

Summary

The env space consumed by exporting all libc's .meta files
left little room for command line,
unexport when done.

Update dirdeps.mk to latest and add
dirdeps-targets.mk to simplify/update targets/Makefile

Makefile changes to go with Makefile.depend changes
in D22494

[bdrewery]

lib/libmagic/Makefile

43–54 ↗

(On Diff #64708)

Strange this stuff wasn't needed before. I thought I had it working. Shrug this is fine.

share/mk/local.meta.sys.mk

99 ↗

(On Diff #64708)

Does PYTHON not being set warrant all of this logic? Is there a risk it won't be set in MAKELEVEL > 0?

usr.sbin/rtsold/cap_llflags.c

47 ↗

(On Diff #64708)

Unrelated change?

[bdrewery]

I may disappear so I'll approve for now; my questions aren't blockers but I think there is an unrelated change that should be fixed first.

head/lib/libbsnmp/libbsnmp/Makefile

 LIBADD= crypto
 .endif
 
 SRCS=   asn1.c snmp.c snmpagent.c snmpclient.c snmpcrypto.c support.c
 SRCS+=  snmptc.h
 INCS=   asn1.h snmp.h snmpagent.h snmpclient.h
 MAN=    asn1.3 bsnmpagent.3 bsnmpclient.3 bsnmplib.3
 
+.if ${MK_DIRDEPS_BUILD} == "yes"
+GENSNMPTREE?= ${HOST_OBJTOP}/usr.sbin/bsnmpd/gensnmptree/gensnmptree
+.endif
+GENSNMPTREE?= gensnmptree
+
 snmptc.h : tc.def
         (\
         echo "/* autogenerated from tc.def */";\
         echo "#ifndef snmptc_h_1529923773";\
         echo "#define snmptc_h_1529923773";\
-        gensnmptree -E -f <${.ALLSRC};\
+        ${GENSNMPTREE} -E -f <${.ALLSRC};\
         echo "#endif" ; \
         ) >${.TARGET}
 
 CLEANFILES+= snmptc.h
 
 MLINKS+=        asn1.3  asn_append_oid.3
 MLINKS+=        asn1.3  asn_commit_header.3
 MLINKS+=        asn1.3  asn_compare_oid.3

head/lib/libgcc_eh/Makefile

 # $FreeBSD$
 
 .include <src.opts.mk>
 
 PACKAGE=        clibs
 LIB=            gcc_eh
 NO_PIC=
 MK_SSP=         no
 WARNS?= 2
 
 .include "Makefile.inc"
 
+.if ${.MAKE.LEVEL} > 0
+# avoid circular dependencies
+GENDIRDEPS_FILTER+= Nlib/msun
+CFLAGS+= -I${SRCTOP}/lib/msun/src
+.endif
+
 .include <bsd.lib.mk>

head/lib/libmagic/Makefile

MAGFILES=       ${CONTRDIR}/magic/Header \
                 ${CONTRDIR}/magic/Magdir/[a-z]*
 
 magic: ${MAGFILES}
         cat ${.ALLSRC:O} > ${.TARGET}
 
 magic.mgc: mkmagic magic
         ${BTOOLSPATH:U.}/mkmagic magic
 
+.if ${MACHINE} == "host" || ${MK_DIRDEPS_BUILD} == "no"
 CLEANFILES+=    mkmagic
 DEPENDOBJS+=    mkmagic
 build-tools: mkmagic
 mkmagic: apprentice.c cdf_time.c encoding.c funcs.c magic.c print.c ${INCS} ${BUILD_TOOLS_META}
         ${CC:N${CCACHE_BIN}} ${CFLAGS} -DCOMPILE_ONLY ${LDFLAGS} -o ${.TARGET} \
             ${.ALLSRC:N*.h:O:u} ${LDADD}
+
+.endif
+.if ${MK_DIRDEPS_BUILD} == "yes"
+BTOOLSPATH= ${HOST_OBJTOP}/${RELDIR}
+.endif
 
 FILEVER!= awk '$$1 == "\#define" && $$2 == "VERSION" { print $$3; exit }' \
                         ${.CURDIR}/config.h
 CLEANFILES+=    ${MAN}
 .for mp in ${MAN}
 ${mp}: ${mp:C/[0-9]/man/}
         sed -e 's/__FSECTION__/5/g' -e 's/__CSECTION__/1/g' \
                 -e 's/__VERSION__/${FILEVER}/g' \

head/lib/libpmc/Makefile

 .if ${MACHINE_ARCH} == "aarch64"
 EVENT_ARCH="arm64"
 .elif ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
 EVENT_ARCH="x86"
 .elif ${MACHINE_ARCH} == "powerpc"
 EVENT_ARCH="powerpc"
 .endif
 
+.if ${MK_DIRDEPS_BUILD} == "yes"
+# avoid circular dependency
+CFLAGS+= -I${RELDIR:H}/libpmcstat
+GENDIRDEPS_FILTER+= N${RELDIR:H}/libpmcstat
+JEVENTS?= ${HOST_OBJTOP}/${RELDIR}/pmu-events/jevents
+.else
 JEVENTS= ${BTOOLSPATH:U.}/pmu-events/jevents
+
 # This file is built in a subdirectory so never try to rebuild it here.
 ${JEVENTS}: .PHONY
 .if make(*clean*)
 SUBDIR+= pmu-events
+.endif
 .endif
 
 libpmc_events.c: ${JEVENTS}
         ${JEVENTS} ${EVENT_ARCH} ${.CURDIR}/pmu-events/arch libpmc_events.c
 SRCS+= libpmc_events.c
 .endif
 
 WARNS?= 3