svn commit: r486867 - head/security/clamav
Mark Linimon
linimon at FreeBSD.org
Fri Dec 7 15:34:53 UTC 2018
Author: linimon
Date: Fri Dec 7 15:34:52 2018
New Revision: 486867
URL: https://svnweb.freebsd.org/changeset/ports/486867
Log:
Base GCC supports neither -Wno-logical-op-parentheses nor -Wno-dangling-else.
Remove them on GCC-based architectures to fix build.
PR: 233800
Submitted by: Piotr Kubaj
Approved by: maintainer
Modified:
head/security/clamav/Makefile
Modified: head/security/clamav/Makefile
==============================================================================
--- head/security/clamav/Makefile Fri Dec 7 15:24:08 2018 (r486866)
+++ head/security/clamav/Makefile Fri Dec 7 15:34:52 2018 (r486867)
@@ -141,6 +141,8 @@ SED_CONF= -E -e 's|^\#?(Example)$$|\#\1|' \
-e 's|^\#?(MilterSocket) */tmp.*$$|\1 ${CLAMAV_MILTER_SOCKET}|' \
-e 's|^\#?(ClamdSocket).*$$|\1 unix:${CLAMAV_CLAMD_SOCKET}|'
+.include <bsd.port.pre.mk>
+
post-patch:
@${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|-lthr|g' \
-e 's|LC_REVISION=22|LC_REVISION=24|' \
@@ -149,6 +151,13 @@ post-patch:
${WRKSRC}/etc/clamd.conf.sample \
${WRKSRC}/etc/freshclam.conf.sample \
${WRKSRC}/etc/clamav-milter.conf.sample
+.if exists(/usr/lib/libstdc++.so)
+ @${REINPLACE_CMD} -e 's|-Wno-logical-op-parentheses||' \
+ -e 's|-Wno-dangling-else||' \
+ ${WRKSRC}/libclamav/Makefile.am \
+ ${WRKSRC}/libclamav/Makefile.in \
+ ${WRKSRC}/libclamunrar/makefile
+.endif
pre-configure-TESTS-on:
@if ! ${PYTHON_CMD} -c "import thread" >/dev/null 2>&1; then \
@@ -174,4 +183,4 @@ post-install:
${STAGEDIR}${RUNDIR}
(cd ${WRKSRC}/docs/html; ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/html)
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
More information about the svn-ports-all
mailing list