svn commit: r356676 - in head: contrib/unbound lib/libunbound usr.sbin/unbound usr.sbin/unbound/anchor usr.sbin/unbound/checkconf usr.sbin/unbound/control usr.sbin/unbound/daemon
Cy Schubert
cy at FreeBSD.org
Mon Jan 13 06:55:33 UTC 2020
Author: cy
Date: Mon Jan 13 06:55:31 2020
New Revision: 356676
URL: https://svnweb.freebsd.org/changeset/base/356676
Log:
Unbound's config.h is manually maintained, using a ./configure produced
config.h as a guide. In practice contributed software maintains a copy
of config.h within its build directory tree containing its Makefile.
usr.sbin/unbound is the home for its config.h.
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D22983
Added:
head/usr.sbin/unbound/config.h (contents, props changed)
- copied, changed from r356675, head/contrib/unbound/config.h
Deleted:
head/contrib/unbound/config.h
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 Mon Jan 13 03:39:02 2020 (r356675)
+++ head/lib/libunbound/Makefile Mon Jan 13 06:55:31 2020 (r356676)
@@ -13,6 +13,7 @@ PRIVATELIB=
PACKAGE= unbound
CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR} -I${.OBJDIR}
+CFLAGS+= -I${SRCTOP}/usr.sbin/unbound
SRCS= alloc.c as112.c authzone.c autotrust.c cachedb.c config_file.c \
configlexer.l configparser.y context.c dname.c dns.c dns64.c \
Modified: head/usr.sbin/unbound/anchor/Makefile
==============================================================================
--- head/usr.sbin/unbound/anchor/Makefile Mon Jan 13 03:39:02 2020 (r356675)
+++ head/usr.sbin/unbound/anchor/Makefile Mon Jan 13 06:55:31 2020 (r356676)
@@ -10,6 +10,7 @@ EXPATDIR= ${SRCTOP}/contrib/expat
PROG= local-unbound-anchor
SRCS= unbound-anchor.c
CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR} -I${EXPATDIR}/lib
+CFLAGS+= -I${.CURDIR:H} -I${.CURDIR}
LIBADD= unbound bsdxml ssl crypto pthread
MAN= local-unbound-anchor.8
Modified: head/usr.sbin/unbound/checkconf/Makefile
==============================================================================
--- head/usr.sbin/unbound/checkconf/Makefile Mon Jan 13 03:39:02 2020 (r356675)
+++ head/usr.sbin/unbound/checkconf/Makefile Mon Jan 13 06:55:31 2020 (r356676)
@@ -9,6 +9,7 @@ UNBOUNDDIR= ${SRCTOP}/contrib/unbound
PROG= local-unbound-checkconf
SRCS= ub_event.c unbound-checkconf.c worker_cb.c
CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR}
+CFLAGS+= -I${.CURDIR:H} -I${.CURDIR}
LIBADD= unbound pthread
MAN= local-unbound-checkconf.8
Copied and modified: head/usr.sbin/unbound/config.h (from r356675, head/contrib/unbound/config.h)
==============================================================================
--- head/contrib/unbound/config.h Mon Jan 13 03:39:02 2020 (r356675, copy source)
+++ head/usr.sbin/unbound/config.h Mon Jan 13 06:55:31 2020 (r356676)
@@ -1,5 +1,6 @@
/* config.h. Generated from config.h.in by configure. */
/* config.h.in. Generated from configure.ac by autoheader. */
+/* $FreeBSD$ */
/* apply the noreturn attribute to a function that exits the program */
#define ATTR_NORETURN __attribute__((__noreturn__))
Modified: head/usr.sbin/unbound/control/Makefile
==============================================================================
--- head/usr.sbin/unbound/control/Makefile Mon Jan 13 03:39:02 2020 (r356675)
+++ head/usr.sbin/unbound/control/Makefile Mon Jan 13 06:55:31 2020 (r356676)
@@ -9,6 +9,7 @@ UNBOUNDDIR= ${SRCTOP}/contrib/unbound
PROG= local-unbound-control
SRCS= ub_event.c unbound-control.c worker_cb.c
CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR}
+CFLAGS+= -I${.CURDIR:H} -I${.CURDIR}
LIBADD= unbound crypto ssl pthread
MAN= local-unbound-control.8
Modified: head/usr.sbin/unbound/daemon/Makefile
==============================================================================
--- head/usr.sbin/unbound/daemon/Makefile Mon Jan 13 03:39:02 2020 (r356675)
+++ head/usr.sbin/unbound/daemon/Makefile Mon Jan 13 06:55:31 2020 (r356676)
@@ -10,6 +10,7 @@ PROG= local-unbound
SRCS= acl_list.c cachedump.c daemon.c remote.c shm_main.c stats.c \
ub_event.c unbound.c worker.c
CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR}
+CFLAGS+= -I${.CURDIR:H} -I${.CURDIR}
LIBADD= unbound util ssl crypto pthread
MAN= local-unbound.8 local-unbound.conf.5
More information about the svn-src-all
mailing list