svn commit: r355904 - in head: lib/libmagic lib/libpmc share/mk

[Simon J. Gerraty]

Author: sjg
Date: Thu Dec 19 02:40:04 2019
New Revision: 355904
URL: https://svnweb.freebsd.org/changeset/base/355904

Log:
  Tweaks for DIRDEPS_BUILD
  
  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

Modified:
  head/lib/libmagic/Makefile
  head/lib/libpmc/Makefile
  head/share/mk/local.dirdeps.mk

Modified: head/lib/libmagic/Makefile
==============================================================================
--- head/lib/libmagic/Makefile	Thu Dec 19 02:32:37 2019	(r355903)
+++ head/lib/libmagic/Makefile	Thu Dec 19 02:40:04 2019	(r355904)
@@ -37,7 +37,7 @@ MAGFILES=	${CONTRDIR}/magic/Header \
 magic: ${MAGFILES}
 	cat ${.ALLSRC:O} > ${.TARGET}
 
-magic.mgc: mkmagic magic
+magic.mgc: magic
 	${BTOOLSPATH:U.}/mkmagic magic
 
 .if ${MACHINE} == "host" || ${MK_DIRDEPS_BUILD} == "no"
@@ -51,6 +51,8 @@ mkmagic: apprentice.c cdf_time.c encoding.c funcs.c ma
 .endif
 .if ${MK_DIRDEPS_BUILD} == "yes"
 BTOOLSPATH= ${HOST_OBJTOP}/${RELDIR}
+.else
+magic.mgc: mkmagic
 .endif
 
 FILEVER!= awk '$$1 == "\#define" && $$2 == "VERSION" { print $$3; exit }' \

Modified: head/lib/libpmc/Makefile
==============================================================================
--- head/lib/libpmc/Makefile	Thu Dec 19 02:32:37 2019	(r355903)
+++ head/lib/libpmc/Makefile	Thu Dec 19 02:40:04 2019	(r355904)
@@ -20,7 +20,7 @@ EVENT_ARCH="powerpc"
 
 .if ${MK_DIRDEPS_BUILD} == "yes"
 # avoid circular dependency
-CFLAGS+= -I${RELDIR:H}/libpmcstat
+CFLAGS+= -I${SRCTOP}/${RELDIR:H}/libpmcstat
 GENDIRDEPS_FILTER+= N${RELDIR:H}/libpmcstat
 JEVENTS?= ${HOST_OBJTOP}/${RELDIR}/pmu-events/jevents
 .else

Modified: head/share/mk/local.dirdeps.mk
==============================================================================
--- head/share/mk/local.dirdeps.mk	Thu Dec 19 02:32:37 2019	(r355903)
+++ head/share/mk/local.dirdeps.mk	Thu Dec 19 02:40:04 2019	(r355904)
@@ -222,7 +222,7 @@ DIRDEPS += targets/pseudo/stage
 .endif
 
 # 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
 .endif