From owner-svn-src-all@freebsd.org Fri Mar 11 20:04:34 2016 Return-Path: Delivered-To: svn-src-all@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 9D938ACC76F; Fri, 11 Mar 2016 20:04:34 +0000 (UTC) (envelope-from jhibbits@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 796609AA; Fri, 11 Mar 2016 20:04:34 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2BK4XLl043273; Fri, 11 Mar 2016 20:04:33 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2BK4XiG043268; Fri, 11 Mar 2016 20:04:33 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201603112004.u2BK4XiG043268@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Fri, 11 Mar 2016 20:04:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r296677 - in head: lib/libunbound usr.sbin/unbound/anchor usr.sbin/unbound/checkconf usr.sbin/unbound/control usr.sbin/unbound/daemon X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Mar 2016 20:04:34 -0000 Author: jhibbits Date: Fri Mar 11 20:04:32 2016 New Revision: 296677 URL: https://svnweb.freebsd.org/changeset/base/296677 Log: Add to CFLAGS, rather than replacing. This allows additional CFLAGS, as set in bsd.cpu.mk, to go through. Modified: head/lib/libunbound/Makefile head/usr.sbin/unbound/anchor/Makefile head/usr.sbin/unbound/checkconf/Makefile head/usr.sbin/unbound/control/Makefile head/usr.sbin/unbound/daemon/Makefile Modified: head/lib/libunbound/Makefile ============================================================================== --- head/lib/libunbound/Makefile Fri Mar 11 19:28:43 2016 (r296676) +++ head/lib/libunbound/Makefile Fri Mar 11 20:04:32 2016 (r296677) @@ -10,7 +10,7 @@ UNBOUNDDIR= ${.CURDIR}/../../contrib/unb LIB= unbound PRIVATELIB= -CFLAGS= -I${UNBOUNDDIR} -I${LDNSDIR} -I${.OBJDIR} +CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR} -I${.OBJDIR} SRCS= alloc.c as112.c autotrust.c config_file.c configlexer.l configparser.y \ context.c dname.c dns.c dns64.c dnstree.c fptr_wlist.c infra.c \ Modified: head/usr.sbin/unbound/anchor/Makefile ============================================================================== --- head/usr.sbin/unbound/anchor/Makefile Fri Mar 11 19:28:43 2016 (r296676) +++ head/usr.sbin/unbound/anchor/Makefile Fri Mar 11 20:04:32 2016 (r296677) @@ -9,7 +9,7 @@ EXPATDIR= ${.CURDIR}/../../../contrib/ex PROG= unbound-anchor SRCS= unbound-anchor.c -CFLAGS= -I${UNBOUNDDIR} -I${LDNSDIR} -I${EXPATDIR}/lib +CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR} -I${EXPATDIR}/lib LIBADD= unbound bsdxml ssl crypto pthread MAN= unbound-anchor.8 Modified: head/usr.sbin/unbound/checkconf/Makefile ============================================================================== --- head/usr.sbin/unbound/checkconf/Makefile Fri Mar 11 19:28:43 2016 (r296676) +++ head/usr.sbin/unbound/checkconf/Makefile Fri Mar 11 20:04:32 2016 (r296677) @@ -8,7 +8,7 @@ UNBOUNDDIR= ${.CURDIR}/../../../contrib/ PROG= unbound-checkconf SRCS= unbound-checkconf.c worker_cb.c -CFLAGS= -I${UNBOUNDDIR} -I${LDNSDIR} +CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR} LIBADD= unbound pthread MAN= unbound-checkconf.8 Modified: head/usr.sbin/unbound/control/Makefile ============================================================================== --- head/usr.sbin/unbound/control/Makefile Fri Mar 11 19:28:43 2016 (r296676) +++ head/usr.sbin/unbound/control/Makefile Fri Mar 11 20:04:32 2016 (r296677) @@ -8,7 +8,7 @@ UNBOUNDDIR= ${.CURDIR}/../../../contrib/ PROG= unbound-control SRCS= unbound-control.c worker_cb.c -CFLAGS= -I${UNBOUNDDIR} -I${LDNSDIR} +CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR} LIBADD= unbound crypto ssl pthread MAN= unbound-control.8 Modified: head/usr.sbin/unbound/daemon/Makefile ============================================================================== --- head/usr.sbin/unbound/daemon/Makefile Fri Mar 11 19:28:43 2016 (r296676) +++ head/usr.sbin/unbound/daemon/Makefile Fri Mar 11 20:04:32 2016 (r296677) @@ -8,7 +8,7 @@ UNBOUNDDIR= ${.CURDIR}/../../../contrib/ PROG= unbound SRCS= acl_list.c cachedump.c daemon.c remote.c stats.c unbound.c worker.c -CFLAGS= -I${UNBOUNDDIR} -I${LDNSDIR} +CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR} LIBADD= unbound util ssl crypto pthread MAN= unbound.8 unbound.conf.5