Sun Nov 8 23:28:05 2015 UTC ()
Apply additional patch (requested by christos in ticket #1024):
-D__syslog__=__printf__


(riz)
diff -r1.14.2.1 -r1.14.2.2 src/external/bsd/ntp/Makefile.inc
cvs diff -r1.14.2.1 -r1.14.2.2 src/external/bsd/ntp/Makefile.inc (switch to unified diff)

--- src/external/bsd/ntp/Makefile.inc 2014/12/24 00:05:04 1.14.2.1
+++ src/external/bsd/ntp/Makefile.inc 2015/11/08 23:28:05 1.14.2.2
@@ -1,74 +1,75 @@ @@ -1,74 +1,75 @@
1# $NetBSD: Makefile.inc,v 1.14.2.1 2014/12/24 00:05:04 riz Exp $ 1# $NetBSD: Makefile.inc,v 1.14.2.2 2015/11/08 23:28:05 riz Exp $
2 2
3.if !defined(NTP_MAKEFILE_INC) 3.if !defined(NTP_MAKEFILE_INC)
4NTP_MAKEFILE_INC=yes 4NTP_MAKEFILE_INC=yes
5 5
6USE_FORT?= yes # network client/server 6USE_FORT?= yes # network client/server
7 7
8CWARNFLAGS+= -Wno-missing-noreturn 8CWARNFLAGS+= -Wno-missing-noreturn
9CWARNFLAGS.clang+= -Wno-unneeded-internal-declaration \ 9CWARNFLAGS.clang+= -Wno-unneeded-internal-declaration \
10 -Wno-parentheses -Wno-constant-logical-operand \ 10 -Wno-parentheses -Wno-constant-logical-operand \
11 -Wno-error=unused-const-variable 11 -Wno-error=unused-const-variable
12 12
13WARNS?= 4 13WARNS?= 4
14 14
15 15
16.include <bsd.own.mk> 16.include <bsd.own.mk>
17 17
18IDIST= ${NETBSDSRCDIR}/external/bsd/ntp/dist 18IDIST= ${NETBSDSRCDIR}/external/bsd/ntp/dist
19NTP_SRCDIR= ${NETBSDSRCDIR}/external/bsd/ntp 19NTP_SRCDIR= ${NETBSDSRCDIR}/external/bsd/ntp
20NTP_HTMLDIR= /usr/share/doc/reference/ref8 20NTP_HTMLDIR= /usr/share/doc/reference/ref8
21 21
22SYSCONFDIR=/etc 22SYSCONFDIR=/etc
23LOCALSTATEDIR=/var 23LOCALSTATEDIR=/var
24 24
 25CPPFLAGS+=-D__syslog__=__printf__
25CPPFLAGS+=-DHAVE_CONFIG_H 26CPPFLAGS+=-DHAVE_CONFIG_H
26CPPFLAGS+=-I${NTP_SRCDIR}/include \ 27CPPFLAGS+=-I${NTP_SRCDIR}/include \
27 -I${IDIST}/include \ 28 -I${IDIST}/include \
28 -I${IDIST}/lib/isc/include \ 29 -I${IDIST}/lib/isc/include \
29 -I${IDIST}/lib/isc/unix/include \ 30 -I${IDIST}/lib/isc/unix/include \
30 -I${IDIST}/lib/isc/nothreads/include 31 -I${IDIST}/lib/isc/nothreads/include
31 32
32.if defined(PROG) 33.if defined(PROG)
33LIBNTP!= cd ${.CURDIR}/../../lib/libntp && ${PRINTOBJDIR} 34LIBNTP!= cd ${.CURDIR}/../../lib/libntp && ${PRINTOBJDIR}
34LIBISC!= cd ${.CURDIR}/../../lib/libiscntp && ${PRINTOBJDIR} 35LIBISC!= cd ${.CURDIR}/../../lib/libiscntp && ${PRINTOBJDIR}
35LIBOPTS!= cd ${.CURDIR}/../../lib/libopts && ${PRINTOBJDIR} 36LIBOPTS!= cd ${.CURDIR}/../../lib/libopts && ${PRINTOBJDIR}
36LIBPARSE!= cd ${.CURDIR}/../../lib/libparse && ${PRINTOBJDIR} 37LIBPARSE!= cd ${.CURDIR}/../../lib/libparse && ${PRINTOBJDIR}
37 38
38LDADD+= -L${LIBNTP} -lntp -L${LIBOPTS} -lopts 39LDADD+= -L${LIBNTP} -lntp -L${LIBOPTS} -lopts
39DPADD+= ${LIBNTP}/libntp.a ${LIBOPTS}/libopts.a 40DPADD+= ${LIBNTP}/libntp.a ${LIBOPTS}/libopts.a
40 41
41.if ${MKCRYPTO:Uno} != "no" 42.if ${MKCRYPTO:Uno} != "no"
42LDADD+= -lcrypto -lcrypt 43LDADD+= -lcrypto -lcrypt
43DPADD+= ${LIBCRYPTO} ${LIBCRYPT} 44DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
44.endif 45.endif
45 46
46.if ${MKMDNS:Uno} != "no" 47.if ${MKMDNS:Uno} != "no"
47CPPFLAGS+=-DHAVE_DNSREGISTRATION=1 48CPPFLAGS+=-DHAVE_DNSREGISTRATION=1
48LDADD+=-ldns_sd 49LDADD+=-ldns_sd
49.endif 50.endif
50 51
51SRCS+= version.c 52SRCS+= version.c
52 53
53CLEANFILES+=version.c version.o 54CLEANFILES+=version.c version.o
54version.c: ${LIBNTP}/libntp.a ${.CURDIR}/../../scripts/mkver ${.CURDIR}/../../importdate 55version.c: ${LIBNTP}/libntp.a ${.CURDIR}/../../scripts/mkver ${.CURDIR}/../../importdate
55 ${_MKTARGET_CREATE} 56 ${_MKTARGET_CREATE}
56 ${HOST_SH} ${.CURDIR}/../../scripts/mkver ${PROG} > /dev/null 57 ${HOST_SH} ${.CURDIR}/../../scripts/mkver ${PROG} > /dev/null
57 58
58.endif # defined(PROG) 59.endif # defined(PROG)
59 60
60.if ${MKCRYPTO:Uno} != "no" 61.if ${MKCRYPTO:Uno} != "no"
61CPPFLAGS+=-DOPENSSL 62CPPFLAGS+=-DOPENSSL
62.endif 63.endif
63 64
64.if ${MKINET6:Uno} != "no" 65.if ${MKINET6:Uno} != "no"
65CPPFLAGS+=-DWANT_IPV6 66CPPFLAGS+=-DWANT_IPV6
66.else 67.else
67CPPFLAGS+=-DISC_PLATFORM_NEEDIN6ADDRANY 68CPPFLAGS+=-DISC_PLATFORM_NEEDIN6ADDRANY
68.endif 69.endif
69 70
70.if exists(${.CURDIR}/../../Makefile.inc) 71.if exists(${.CURDIR}/../../Makefile.inc)
71.include "${.CURDIR}/../../Makefile.inc" 72.include "${.CURDIR}/../../Makefile.inc"
72.endif 73.endif
73 74
74.endif 75.endif