From owner-freebsd-current@FreeBSD.ORG  Sat Nov 23 08:30:05 2013
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: current@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3379AC13;
 Sat, 23 Nov 2013 08:30:05 +0000 (UTC)
Received: from cell.glebius.int.ru (glebius.int.ru [81.19.69.10])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id B54702C46;
 Sat, 23 Nov 2013 08:30:04 +0000 (UTC)
Received: from cell.glebius.int.ru (localhost [127.0.0.1])
 by cell.glebius.int.ru (8.14.7/8.14.7) with ESMTP id rAN8U2XQ093163
 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO);
 Sat, 23 Nov 2013 12:30:02 +0400 (MSK)
 (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by cell.glebius.int.ru (8.14.7/8.14.7/Submit) id rAN8U2bo093162;
 Sat, 23 Nov 2013 12:30:02 +0400 (MSK)
 (envelope-from glebius@FreeBSD.org)
X-Authentication-Warning: cell.glebius.int.ru: glebius set sender to
 glebius@FreeBSD.org using -f
Date: Sat, 23 Nov 2013 12:30:02 +0400
From: Gleb Smirnoff <glebius@FreeBSD.org>
To: Andrey Chernov <ache@freebsd.org>
Subject: Re: ipfw build error with WITHOUT_PF (pfvar.h)
Message-ID: <20131123083002.GF90895@glebius.int.ru>
References: <52906247.4030504@freebsd.org>
 <20131123081227.GD90895@glebius.int.ru>
 <52906558.2010604@freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <52906558.2010604@freebsd.org>
User-Agent: Mutt/1.5.22 (2013-10-16)
Cc: current@FreeBSD.org
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.16
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
 <freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-current>, 
 <mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current/>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
 <mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 23 Nov 2013 08:30:05 -0000

On Sat, Nov 23, 2013 at 12:20:40PM +0400, Andrey Chernov wrote:
A> > On Sat, Nov 23, 2013 at 12:07:35PM +0400, Andrey Chernov wrote:
A> > A> There is a problem in recent -current to build ipfw with WITHOUT_PF
A> > A> option, introduced in r257215. altq.c file produce error due to included
A> > A> <net/pfvar.h> have following includes
A> > A> 
A> > A> #include <netpfil/pf/pf.h>
A> > A> #include <netpfil/pf/pf_altq.h>
A> > A> #include <netpfil/pf/pf_mtag.h>
A> > A> 
A> > A> and netpfil/pf directory is empty in
A> > A> /usr/src/include/Makefile with WITHOUT_PF option.
A> > 
A> > The quick solution would be to make ipfw lose some functionality if
A> > PF is cut away from system.
A> > 
A> > The proper solution would be to make ALTQ configurable w/o pfctl.
A> > 
A> 
A> How it was handled previously? F.e. ipfw in -stable 9 builds normally
A> with WITHOUT_PF and have pfvar.h included too, but old pfvar.h have only
A> <net/pf_mtag.h> which is available with WITHOUT_PF.

In 11 we are splitting the includes, but this isn't actually the cause
of problem. This is unrelated.

The cause is that in stable/9 header installation ignores WITHOUT_PF
and installs headers always. Userland programs (except core pf utilities)
are also compiled with pf support.

So, in 11 WITHOUT_PF is more clean, but as you found, some consequences
arise.

-- 
Totus tuus, Glebius.