svn commit: r428233 - head/Mk/Uses [kmod.mk]

[John Marino]

On 12/9/2016 12:47, Rene Ladan wrote:
> Author: rene
> Date: Fri Dec  9 18:47:09 2016
> New Revision: 428233
> URL: https://svnweb.freebsd.org/changeset/ports/428233
>
> Log:
>   Uses/kmod.mk: add support for debug versions of kernel modules.
>
>   Submitted by:	glebius via private mail
>
> Modified:
>   head/Mk/Uses/kmod.mk
>
> Modified: head/Mk/Uses/kmod.mk
> ==============================================================================
> --- head/Mk/Uses/kmod.mk	Fri Dec  9 17:50:43 2016	(r428232)
> +++ head/Mk/Uses/kmod.mk	Fri Dec  9 18:47:09 2016	(r428233)
> @@ -34,13 +34,19 @@ MAKE_ENV+=	KMODDIR="${KMODDIR}" SYSDIR="
>  PLIST_FILES+=	"@kld ${KMODDIR}"
>
>  STRIP_CMD+=	--strip-debug # do not strip kernel symbols
> +KERN_DEBUGDIR?=	${DEBUGDIR}
>  .endif
>
>  .if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_KMOD_POST_MK)
>  _INCLUDE_USES_KMOD_POST_MK=	yes
>
>  _USES_install+=	290:${STAGEDIR}${KMODDIR}
> +_USES_install+=	291:${STAGEDIR}${KERN_DEBUGDIR}${KMODDIR}
> +
>  ${STAGEDIR}${KMODDIR}:
>  	@${MKDIR} ${.TARGET}
>
> +${STAGEDIR}${KERN_DEBUGDIR}${KMODDIR}:
> +	@${MKDIR} ${.TARGET}
> +
>  .endif
>


After this commit, I am seeing:
make: "/xports/Mk/Uses/kmod.mk" line 50: warning: duplicate script for 
target "/construction/x11-drivers/drm-kmod/stage/boot/modules" ignored
make: "/xports/Mk/Uses/kmod.mk" line 47: warning: using previous script 
for "/construction/x11-drivers/drm-kmod/stage/boot/modules" defined here

The cause is that if KERN_DEBUGDIR is not defined, the targets ending in 
${KMODDIR} are identical.  There needs to be a guard checking for the 
definition of KERN_DEBUGDIR.

Thanks,
John



---
This email has been checked for viruses by Avast antivirus software.
https://www.avast.com/antivirus