From owner-svn-ports-all@freebsd.org Fri Dec 7 15:34:53 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5FDD91310DDF; Fri, 7 Dec 2018 15:34:53 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 06FF48FB2E; Fri, 7 Dec 2018 15:34:53 +0000 (UTC) (envelope-from linimon@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DCEF714FEA; Fri, 7 Dec 2018 15:34:52 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wB7FYqnC046019; Fri, 7 Dec 2018 15:34:52 GMT (envelope-from linimon@FreeBSD.org) Received: (from linimon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wB7FYq8c046018; Fri, 7 Dec 2018 15:34:52 GMT (envelope-from linimon@FreeBSD.org) Message-Id: <201812071534.wB7FYq8c046018@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: linimon set sender to linimon@FreeBSD.org using -f From: Mark Linimon Date: Fri, 7 Dec 2018 15:34:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r486867 - head/security/clamav X-SVN-Group: ports-head X-SVN-Commit-Author: linimon X-SVN-Commit-Paths: head/security/clamav X-SVN-Commit-Revision: 486867 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 06FF48FB2E X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.99)[-0.988,0]; NEURAL_HAM_LONG(-0.99)[-0.990,0]; NEURAL_HAM_SHORT(-0.96)[-0.963,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Dec 2018 15:34:53 -0000 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 + 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 +.include