Thu Aug 25 17:05:45 2011 UTC ()
Move -Wno-comment for clang to CPPFLAGS, so that mkdep runs are silent.


(joerg)
diff -r1.12 -r1.13 src/external/ibm-public/postfix/Makefile.inc
cvs diff -r1.12 -r1.13 src/external/ibm-public/postfix/Makefile.inc (switch to unified diff)

--- src/external/ibm-public/postfix/Makefile.inc 2011/05/26 12:56:27 1.12
+++ src/external/ibm-public/postfix/Makefile.inc 2011/08/25 17:05:45 1.13
@@ -1,99 +1,100 @@ @@ -1,99 +1,100 @@
1# $NetBSD: Makefile.inc,v 1.12 2011/05/26 12:56:27 joerg Exp $ 1# $NetBSD: Makefile.inc,v 1.13 2011/08/25 17:05:45 joerg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5USE_FORT?= yes # network client and server 5USE_FORT?= yes # network client and server
6CWARNFLAGS.clang+= -Wno-comment -Wno-empty-body -Wno-format-extra-args 6CWARNFLAGS.clang+= -Wno-empty-body -Wno-format-extra-args
7 7
8WARNS?= 0 8WARNS?= 0
9 9
10PFIX_DISTDIR= ${NETBSDSRCDIR}/external/ibm-public/postfix/dist 10PFIX_DISTDIR= ${NETBSDSRCDIR}/external/ibm-public/postfix/dist
11 11
12CPPFLAGS+= -DNETBSD4 -DUSE_SASL_AUTH \ 12CPPFLAGS+= -DNETBSD4 -DUSE_SASL_AUTH \
13 -I${DIST} \ 13 -I${DIST} \
14 -I${PFIX_DISTDIR}/src/dns -I${PFIX_DISTDIR}/src/global \ 14 -I${PFIX_DISTDIR}/src/dns -I${PFIX_DISTDIR}/src/global \
15 -I${PFIX_DISTDIR}/src/master -I${PFIX_DISTDIR}/src/util \ 15 -I${PFIX_DISTDIR}/src/master -I${PFIX_DISTDIR}/src/util \
16 -I${PFIX_DISTDIR}/src/tls -I${PFIX_DISTDIR}/src/milter \ 16 -I${PFIX_DISTDIR}/src/tls -I${PFIX_DISTDIR}/src/milter \
17 -I${PFIX_DISTDIR}/src/xsasl 17 -I${PFIX_DISTDIR}/src/xsasl \
 18 ${${ACTIVE_CC} == "clang":?-Wno-comment:}
18 19
19CPPFLAGS+= -DUSE_SASL_AUTH 20CPPFLAGS+= -DUSE_SASL_AUTH
20CPPFLAGS+= -DDEF_SERVER_SASL_TYPE=\"dovecot\" 21CPPFLAGS+= -DDEF_SERVER_SASL_TYPE=\"dovecot\"
21 22
22.if (${MKCRYPTO} != "no") 23.if (${MKCRYPTO} != "no")
23CPPFLAGS+= -DUSE_SASLC_SASL 24CPPFLAGS+= -DUSE_SASLC_SASL
24CPPFLAGS+= -DDEF_CLIENT_SASL_TYPE=\"saslc\" 25CPPFLAGS+= -DDEF_CLIENT_SASL_TYPE=\"saslc\"
25DPADD+= ${LIBSASCL} ${LIBSSL} 26DPADD+= ${LIBSASCL} ${LIBSSL}
26LDADD+= -lsaslc -lssl 27LDADD+= -lsaslc -lssl
27. if (${MKKERBEROS} != "no") 28. if (${MKKERBEROS} != "no")
28DPADD+= ${LIBGSSAPI} 29DPADD+= ${LIBGSSAPI}
29LDADD+= -lgssapi 30LDADD+= -lgssapi
30. endif 31. endif
31.endif 32.endif
32 33
33.if defined(HAVE_PCC) 34.if defined(HAVE_PCC)
34# code uses gcc-specific aggregate dynamic array 35# code uses gcc-specific aggregate dynamic array
35CPPFLAGS+= -DCANT_USE_SEND_RECV_MSG 36CPPFLAGS+= -DCANT_USE_SEND_RECV_MSG
36.endif 37.endif
37 38
38# TLS support. 39# TLS support.
39.if ${MKCRYPTO} != "no" 40.if ${MKCRYPTO} != "no"
40CPPFLAGS+= -DUSE_TLS 41CPPFLAGS+= -DUSE_TLS
41.endif 42.endif
42 43
43# IPv6 support. 44# IPv6 support.
44.if ${MKINET6} == "no" 45.if ${MKINET6} == "no"
45CPPFLAGS+= -DNO_IPV6 46CPPFLAGS+= -DNO_IPV6
46.endif 47.endif
47 48
48# LDAP support. 49# LDAP support.
49.if ${USE_LDAP} != "no" 50.if ${USE_LDAP} != "no"
50CPPFLAGS+= -DHAS_LDAP 51CPPFLAGS+= -DHAS_LDAP
51 52
52# Automatically link in libldap for a program. 53# Automatically link in libldap for a program.
53. if defined(PROG) 54. if defined(PROG)
54LDADD+= -lldap 55LDADD+= -lldap
55DPADD+= ${LIBLDAP} 56DPADD+= ${LIBLDAP}
56. if (${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "")) 57. if (${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != ""))
57LDADD+= -llber 58LDADD+= -llber
58DPADD+= ${LIBLBER} 59DPADD+= ${LIBLBER}
59. if ${MKCRYPTO} != "no"  60. if ${MKCRYPTO} != "no"
60DPADD+= ${LIBSSL} ${LIBCRYPTO} 61DPADD+= ${LIBSSL} ${LIBCRYPTO}
61LDADD+= -lssl -lcrypto 62LDADD+= -lssl -lcrypto
62. endif 63. endif
63. endif 64. endif
64. endif 65. endif
65.endif # USE_LDAP != no 66.endif # USE_LDAP != no
66 67
67PFIX_SRCDIR= ${NETBSDSRCDIR}/external/ibm-public/postfix 68PFIX_SRCDIR= ${NETBSDSRCDIR}/external/ibm-public/postfix
68PFIX_LIBSDIRS= dns dns masterlib master global global util util \ 69PFIX_LIBSDIRS= dns dns masterlib master global global util util \
69 milter milter xsasl xsasl 70 milter milter xsasl xsasl
70 71
71.if ${MKCRYPTO} != "no"  72.if ${MKCRYPTO} != "no"
72PFIX_LIBSDIRS+= tls tls 73PFIX_LIBSDIRS+= tls tls
73.endif 74.endif
74 75
75.for _LD _LL in ${PFIX_LIBSDIRS} 76.for _LD _LL in ${PFIX_LIBSDIRS}
76.if !defined(POBJDIR.${_LL}) 77.if !defined(POBJDIR.${_LL})
77POBJDIR.${_LL}!=cd ${PFIX_SRCDIR}/lib/${_LD} && ${PRINTOBJDIR} 78POBJDIR.${_LL}!=cd ${PFIX_SRCDIR}/lib/${_LD} && ${PRINTOBJDIR}
78.MAKEOVERRIDES+=POBJDIR.${_LL} 79.MAKEOVERRIDES+=POBJDIR.${_LL}
79.endif 80.endif
80LIBP${_LL:tu}= ${POBJDIR.${_LL}}/lib${_LL}.a 81LIBP${_LL:tu}= ${POBJDIR.${_LL}}/lib${_LL}.a
81.endfor 82.endfor
82 83
83 84
84# Directories to install into. 85# Directories to install into.
85# 86#
86PFIX_LIBEXECDIR=/usr/libexec/postfix 87PFIX_LIBEXECDIR=/usr/libexec/postfix
87PFIX_ETCDIR= /etc/postfix 88PFIX_ETCDIR= /etc/postfix
88PFIX_EXAMPLEDIR=/usr/share/examples/postfix 89PFIX_EXAMPLEDIR=/usr/share/examples/postfix
89PFIX_HTMLDIR= /usr/share/doc/html/postfix 90PFIX_HTMLDIR= /usr/share/doc/html/postfix
90PFIX_SBINDIR= /usr/sbin 91PFIX_SBINDIR= /usr/sbin
91 92
92# override defaults which are otherwise empty and/or so postconf is correct 93# override defaults which are otherwise empty and/or so postconf is correct
93CPPFLAGS+= -DDEF_HTML_DIR=\"${PFIX_HTMLDIR}\" \ 94CPPFLAGS+= -DDEF_HTML_DIR=\"${PFIX_HTMLDIR}\" \
94 -DDEF_README_DIR=\"${PFIX_EXAMPLEDIR}\" \ 95 -DDEF_README_DIR=\"${PFIX_EXAMPLEDIR}\" \
95 -DDEF_SAMPLE_DIR=\"${PFIX_EXAMPLEDIR}\" \ 96 -DDEF_SAMPLE_DIR=\"${PFIX_EXAMPLEDIR}\" \
96 -DDEF_MANPAGE_DIR=\"${MANDIR}\" 97 -DDEF_MANPAGE_DIR=\"${MANDIR}\"
97 98
98# postfix check wants a lot of files to be owned by root 99# postfix check wants a lot of files to be owned by root
99BINOWN= root 100BINOWN= root