d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tweaks for DIRDEPS_BUILD

Browse Source 
libmagic only depend on mkmagic if not DIRDEPS_BUILD

libpmc fix -I for libpmcstat

local.dirdeps.mk be even more careful about adding gnu/lib/csu to DIRDEPS

Reviewed by:	bdrewery
Differential Revision:	https://reviews.freebsd.org/D22872
This commit is contained in:
Simon J. Gerraty 2019-12-19 02:40:04 +00:00
parent 484651cd1b
commit b114e8fcd7
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libmagic/Makefile
View File

@ -37,7 +37,7 @@ MAGFILES= ${CONTRDIR}/magic/Header \
magic: ${MAGFILES} magic: ${MAGFILES}
cat ${.ALLSRC:O} > ${.TARGET} cat ${.ALLSRC:O} > ${.TARGET}
magic.mgc: mkmagic magic magic.mgc: magic
${BTOOLSPATH:U.}/mkmagic magic ${BTOOLSPATH:U.}/mkmagic magic
.if ${MACHINE} == "host" || ${MK_DIRDEPS_BUILD} == "no" .if ${MACHINE} == "host" || ${MK_DIRDEPS_BUILD} == "no"
@ -51,6 +51,8 @@ mkmagic: apprentice.c cdf_time.c encoding.c funcs.c magic.c print.c ${INCS} ${BU
.endif .endif
.if ${MK_DIRDEPS_BUILD} == "yes" .if ${MK_DIRDEPS_BUILD} == "yes"
BTOOLSPATH= ${HOST_OBJTOP}/${RELDIR} BTOOLSPATH= ${HOST_OBJTOP}/${RELDIR}
.else
magic.mgc: mkmagic
.endif .endif
FILEVER!= awk '$$1 == "\#define" && $$2 == "VERSION" { print $$3; exit }' \ FILEVER!= awk '$$1 == "\#define" && $$2 == "VERSION" { print $$3; exit }' \

2
lib/libpmc/Makefile
View File

@ -20,7 +20,7 @@ EVENT_ARCH="powerpc"
.if ${MK_DIRDEPS_BUILD} == "yes" .if ${MK_DIRDEPS_BUILD} == "yes"
# avoid circular dependency # avoid circular dependency
CFLAGS+= -I${RELDIR:H}/libpmcstat CFLAGS+= -I${SRCTOP}/${RELDIR:H}/libpmcstat
GENDIRDEPS_FILTER+= N${RELDIR:H}/libpmcstat GENDIRDEPS_FILTER+= N${RELDIR:H}/libpmcstat
JEVENTS?= ${HOST_OBJTOP}/${RELDIR}/pmu-events/jevents JEVENTS?= ${HOST_OBJTOP}/${RELDIR}/pmu-events/jevents
.else .else

2
share/mk/local.dirdeps.mk
View File

@ -222,7 +222,7 @@ DIRDEPS += targets/pseudo/stage
.endif .endif
# this one is too pervasive # this one is too pervasive
.if ${MK_BSD_CRTBEGIN} == "no" && ${DEP_RELDIR} != "gnu/lib/csu" .if ${MK_BSD_CRTBEGIN} == "no" && ${DEP_RELDIR:N.:Ngnu/lib/csu:Ninclude*:Ntargets/*} != ""
DIRDEPS+= gnu/lib/csu DIRDEPS+= gnu/lib/csu
.endif .endif