From owner-svn-src-head@freebsd.org  Wed Mar  8 17:29:41 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id F14D7D037A3;
 Wed,  8 Mar 2017 17:29:41 +0000 (UTC)
 (envelope-from sbruno@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id BF36E15C2;
 Wed,  8 Mar 2017 17:29:41 +0000 (UTC)
 (envelope-from sbruno@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v28HTesC062972;
 Wed, 8 Mar 2017 17:29:40 GMT (envelope-from sbruno@FreeBSD.org)
Received: (from sbruno@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v28HTekF062971;
 Wed, 8 Mar 2017 17:29:40 GMT (envelope-from sbruno@FreeBSD.org)
Message-Id: <201703081729.v28HTekF062971@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sbruno set sender to
 sbruno@FreeBSD.org using -f
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Wed, 8 Mar 2017 17:29:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r314915 - head/tools/tools/netmap
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Mar 2017 17:29:42 -0000

Author: sbruno
Date: Wed Mar  8 17:29:40 2017
New Revision: 314915
URL: https://svnweb.freebsd.org/changeset/base/314915

Log:
  Use the buildworld includes and defaults when building pkt-gen.  This will
  mean that you need a world built to reliably build pkg-gen but this keeps
  the build from failing when your source doesn't match your host running
  version, e.g. building 12 on 11.
  
  Submitted by:	Matt Macy <mmacy@nextbsd.org>
  MFC after:	2 weeks
  Sponsored by:	Limelight Networks

Modified:
  head/tools/tools/netmap/Makefile

Modified: head/tools/tools/netmap/Makefile
==============================================================================
--- head/tools/tools/netmap/Makefile	Wed Mar  8 14:52:03 2017	(r314914)
+++ head/tools/tools/netmap/Makefile	Wed Mar  8 17:29:40 2017	(r314915)
@@ -8,7 +8,6 @@ PROGS	=	pkt-gen nmreplay bridge vale-ctl
 CLEANFILES = $(PROGS) *.o
 MAN=
 CFLAGS += -Werror -Wall
-CFLAGS += -nostdinc -I ../../../sys -I/usr/include
 CFLAGS += -Wextra
 
 LDFLAGS += -lpthread