From owner-freebsd-bugs@FreeBSD.ORG Sun Oct 7 07:10:10 2012 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 79E4A106566B for ; Sun, 7 Oct 2012 07:10:10 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 4D2398FC0A for ; Sun, 7 Oct 2012 07:10:10 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q977AAiX087376 for ; Sun, 7 Oct 2012 07:10:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q977AA7e087375; Sun, 7 Oct 2012 07:10:10 GMT (envelope-from gnats) Resent-Date: Sun, 7 Oct 2012 07:10:10 GMT Resent-Message-Id: <201210070710.q977AA7e087375@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Garrett Cooper Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 29D84106566B for ; Sun, 7 Oct 2012 07:01:08 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id EF9C38FC19 for ; Sun, 7 Oct 2012 07:01:07 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id q97717m9033551 for ; Sun, 7 Oct 2012 07:01:07 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id q977170a033550; Sun, 7 Oct 2012 07:01:07 GMT (envelope-from nobody) Message-Id: <201210070701.q977170a033550@red.freebsd.org> Date: Sun, 7 Oct 2012 07:01:07 GMT From: Garrett Cooper To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: misc/172440: [patch] [build] fix broken CTFCONVERT_CMD call X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Oct 2012 07:10:10 -0000 >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@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@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@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: