From owner-freebsd-bugs@FreeBSD.ORG Fri Feb 12 03:10:02 2010 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 099951065676 for ; Fri, 12 Feb 2010 03:10:02 +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 C18358FC16 for ; Fri, 12 Feb 2010 03:10:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o1C3A1wh068105 for ; Fri, 12 Feb 2010 03:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o1C3A1AA068104; Fri, 12 Feb 2010 03:10:01 GMT (envelope-from gnats) Resent-Date: Fri, 12 Feb 2010 03:10:01 GMT Resent-Message-Id: <201002120310.o1C3A1AA068104@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 [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 28454106566C for ; Fri, 12 Feb 2010 03:02:56 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 1811D8FC08 for ; Fri, 12 Feb 2010 03:02:56 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o1C32t8m082339 for ; Fri, 12 Feb 2010 03:02:55 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id o1C32tnr082321; Fri, 12 Feb 2010 03:02:55 GMT (envelope-from nobody) Message-Id: <201002120302.o1C32tnr082321@www.freebsd.org> Date: Fri, 12 Feb 2010 03:02:55 GMT From: Garrett Cooper To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: misc/143830: Fix conditional inclusion for sbin/atm/atmconfig 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: Fri, 12 Feb 2010 03:10:02 -0000 >Number: 143830 >Category: misc >Synopsis: Fix conditional inclusion for sbin/atm/atmconfig >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Fri Feb 12 03:10:01 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Garrett Cooper >Release: RELENG_8 >Organization: Cisco Systems, Inc >Environment: FreeBSD garrcoop-fbsd.cisco.com 8.0-STABLE FreeBSD 8.0-STABLE #2: Wed Feb 3 16:57:07 PST 2010 garrcoop@garrcoop-fbsd.cisco.com:/usr/obj/usr/src/sys/LAPPY_X86 i386 >Description: bsnmp is a requirement for atmconfig even though it's not spelled out as such in bsd.own.mk, so make release (or make -C sbin/atm) fails if WITHOUT_BSNMP=yes is specified, like the following: ===> sbin/atm/atmconfig (depend) cat /usr/src/sbin/atm/atmconfig/../../../contrib/ngatm/snmp_atm/atm_tree.def /usr/src/sbin/atm/atmconfig/../../../usr.sbin/bsnmpd/modules/snmp_atm/atm_freebsd.def | gensnmptree -e `tail -n +2 /usr/src/sbin/atm/atmconfig/atm_oid.list` > /usr/obj/usr/src/sbin/atm/atmconfig/oid.h gensnmptree: not found I could not properly determine how to remove the subdirectory from the make operation as I'm just getting used to the Makefile infrastructure. >How-To-Repeat: (cd release; make release WITHOUT_BSNMP=yes) >Fix: Invoke with `WITHOUT_ATM=no WITHOUT_BSNMP=no' or `WITH_ATM=yes WITH_BSNMP=yes'. Patch attached with submission follows: Index: sbin/atm/atmconfig/Makefile =================================================================== RCS file: /usr/local/cvsroot/freebsd/src/sbin/atm/atmconfig/Makefile,v retrieving revision 1.9 diff -u -r1.9 Makefile --- sbin/atm/atmconfig/Makefile 19 Oct 2009 16:00:24 -0000 1.9 +++ sbin/atm/atmconfig/Makefile 12 Feb 2010 02:59:55 -0000 @@ -5,6 +5,10 @@ # # $FreeBSD$ +.include + +.if ${MK_ATM} != "no" + PROG= atmconfig .ifndef RESCUE SRCS= ${.OBJDIR}/oid.h @@ -40,5 +44,7 @@ ${.OBJDIR}/oid.h: atm_oid.list ${SNMP_ATM_DEF} cat ${SNMP_ATM_DEF} | gensnmptree -e `tail -n +2 ${.CURDIR}/atm_oid.list` \ > ${.OBJDIR}/oid.h + +.endif .include >Release-Note: >Audit-Trail: >Unformatted: