From owner-freebsd-bugs@FreeBSD.ORG Tue Apr 2 21:40:01 2013 Return-Path: Delivered-To: freebsd-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 21A52C0D for ; Tue, 2 Apr 2013 21:40:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id E0F5FD4A for ; Tue, 2 Apr 2013 21:40:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r32Le0OQ085830 for ; Tue, 2 Apr 2013 21:40:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r32Le03T085829; Tue, 2 Apr 2013 21:40:00 GMT (envelope-from gnats) Resent-Date: Tue, 2 Apr 2013 21:40:00 GMT Resent-Message-Id: <201304022140.r32Le03T085829@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 [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id D60A2BC6 for ; Tue, 2 Apr 2013 21:37:15 +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 C72A5D2B for ; Tue, 2 Apr 2013 21:37:15 +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 r32LbF1A068006 for ; Tue, 2 Apr 2013 21:37:15 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id r32LbF17068005; Tue, 2 Apr 2013 21:37:15 GMT (envelope-from nobody) Message-Id: <201304022137.r32LbF17068005@red.freebsd.org> Date: Tue, 2 Apr 2013 21:37:15 GMT From: Garrett Cooper To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: bin/177593: [PATCH] bmake doesn't honor BSDmakefile like pmake does X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Apr 2013 21:40:01 -0000 >Number: 177593 >Category: bin >Synopsis: [PATCH] bmake doesn't honor BSDmakefile like pmake does >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: Tue Apr 02 21:40:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Garrett Cooper >Release: 10-CURRENT >Organization: EMC Isilon >Environment: FreeBSD fuji-current.local 10.0-CURRENT FreeBSD 10.0-CURRENT #7 r+bece424: Sat Mar 30 03:15:47 PDT 2013 root@fuji-current.local:/usr/obj/usr/src/sys/FUJI i386 >Description: pmake supports BSDmakefile but bmake doesn't. This patch enhances bmake to support BSDmakefile. >How-To-Repeat: >Fix: Patch attached with submission follows: >From 80a80dc066a2f76b111c30378a064f3e3af56878 Mon Sep 17 00:00:00 2001 From: Garrett Cooper Date: Tue, 2 Apr 2013 14:28:03 -0700 Subject: [PATCH] Support BSDmakefile with bmake Signed-off-by: Garrett Cooper --- usr.bin/bmake/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.bin/bmake/Makefile b/usr.bin/bmake/Makefile index 6cac1ec..ed4a646 100644 --- a/usr.bin/bmake/Makefile +++ b/usr.bin/bmake/Makefile @@ -88,6 +88,7 @@ DEFAULT_SYS_PATH?= .../share/mk:${prefix}/share/mk CPPFLAGS+= -DUSE_META CFLAGS+= ${CPPFLAGS} +CFLAGS+= -DMAKEFILE_PREFERENCE_LIST="\"BSDmakefile makefile Makefile\"" CFLAGS+= -D_PATH_DEFSYSPATH=\"${DEFAULT_SYS_PATH}\" CFLAGS+= -I. -I${srcdir} ${XDEFS} -DMAKE_NATIVE CFLAGS+= ${COPTS.${.ALLSRC:M*.c:T:u}} -- 1.8.1.3 >Release-Note: >Audit-Trail: >Unformatted: