misc/172440: [patch] [build] fix broken CTFCONVERT_CMD call

[Garrett Cooper]

>Number:         172440
>Category:       misc
>Synopsis:       [patch] [build] fix broken CTFCONVERT_CMD call
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Oct 07 07:10:09 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Garrett Cooper
>Release:        
>Organization:
EMC Isilon
>Environment:
>Description:
The MAKE_VERSION check is broken in bsd.own.mk and generates a lot of warnings when compiling CURRENT as CTFCONVERT_CMD evaluates to a NUL string.

$ make -VMAKE_VERSION
9201120530
$ make -f /store/freebsd/atf-head/share/mk/bsd.own.mk COMPILER_FEATURES= -VCTFCONVERT_CMD
$ uname -a
FreeBSD bayonetta.local 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #0 r240836M: Sat Sep 22 12:30:11 PDT 2012     gcooper at bayonetta.local:/usr/obj/store/freebsd/stable/9/sys/BAYONETTA  amd64

The attached patch does the right thing for <= 9.x versions of pmake, 10.x <= versions of pmake, and bmake (bmake doesn't care about NUL commands).

$ FreeBSD bayonetta.local 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #0 r240836M: Sat Sep 22 12:30:11 PDT 2012     gcooper at bayonetta.local:/usr/obj/store/freebsd/stable/9/sys/BAYONETTA  amd64
$ make -f share/mk/bsd.own.mk COMPILER_FEATURES= -VCTFCONVERT_CMD
@:

# uname -a
FreeBSD fallout-freebsd-current.local 10.0-CURRENT FreeBSD 10.0-CURRENT #10: Sat Aug  4 12:02:44 PDT 2012     root at fallout-freebsd-current.local:/usr/obj/nfs/bayonetta/scratch/p4/user/gcooper/atf-head/src/sys/GENERIC  i386
# `make -V.OBJDIR`/make -f ../../share/mk/bsd.own.mk -VCTFCONVERT_CMD

# bmake -f ../../share/mk/bsd.own.mk -VCTFCONVERT_CMD

# `make -V.OBJDIR`/make -VMAKE_VERSION
10201205300
>How-To-Repeat:
Build something using bsd.prog.mk with -DWITHOUT_CTF defined using the 9.x version of pmake and 10.x copy of bsd.own.mk .
>Fix:


Patch attached with submission follows:

Index: share/mk/bsd.own.mk
===================================================================
--- share/mk/bsd.own.mk	(revision 241309)
+++ share/mk/bsd.own.mk	(working copy)
@@ -671,7 +672,8 @@
 
 .if ${MK_CTF} != "no"
 CTFCONVERT_CMD=	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.elif defined(MAKE_VERSION) && ${MAKE_VERSION} >= 5201111300
+.elif defined(WITH_BMAKE) || \
+      (defined(MAKE_VERSION) && ${MAKE_VERSION} >= 10201205300)
 CTFCONVERT_CMD=
 .else
 CTFCONVERT_CMD=	@:


>Release-Note:
>Audit-Trail:
>Unformatted: