From owner-svn-ports-head@FreeBSD.ORG Tue Jan 7 18:54:09 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 03170A14; Tue, 7 Jan 2014 18:54:09 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E29961370; Tue, 7 Jan 2014 18:54:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s07Is84l043721; Tue, 7 Jan 2014 18:54:08 GMT (envelope-from garga@svn.freebsd.org) Received: (from garga@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s07Is8PN043719; Tue, 7 Jan 2014 18:54:08 GMT (envelope-from garga@svn.freebsd.org) Message-Id: <201401071854.s07Is8PN043719@svn.freebsd.org> From: Renato Botelho Date: Tue, 7 Jan 2014 18:54:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r339019 - in head/security/clamav: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Jan 2014 18:54:09 -0000 Author: garga Date: Tue Jan 7 18:54:08 2014 New Revision: 339019 URL: http://svnweb.freebsd.org/changeset/ports/339019 Log: - Add a patch to fix bundled LLVM to build with libc++ - Remove USE_GCC=any PR: ports/185366 Submitted by: tijl@ Added: head/security/clamav/files/patch-libclamav-c++-llvm (contents, props changed) Modified: head/security/clamav/Makefile Modified: head/security/clamav/Makefile ============================================================================== --- head/security/clamav/Makefile Tue Jan 7 18:53:09 2014 (r339018) +++ head/security/clamav/Makefile Tue Jan 7 18:54:08 2014 (r339019) @@ -3,7 +3,7 @@ PORTNAME= clamav PORTVERSION= 0.98 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= SF @@ -44,7 +44,6 @@ IPV6_CONFIGURE_ENABLE= ipv6 GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_GCC= any USES= gmake USE_RC_SUBR= clamav-clamd clamav-freshclam Added: head/security/clamav/files/patch-libclamav-c++-llvm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/clamav/files/patch-libclamav-c++-llvm Tue Jan 7 18:54:08 2014 (r339019) @@ -0,0 +1,72 @@ +--- libclamav/c++/llvm/lib/Target/SubtargetFeature.cpp.orig ++++ libclamav/c++/llvm/lib/Target/SubtargetFeature.cpp +@@ -18,6 +18,7 @@ + #include + #include + #include ++#include + using namespace llvm; + + //===----------------------------------------------------------------------===// +--- libclamav/c++/llvm/include/llvm/Support/CFG.h.orig ++++ libclamav/c++/llvm/include/llvm/Support/CFG.h +@@ -27,8 +27,9 @@ + + template // Predecessor Iterator + class PredIterator : public std::iterator { +- typedef std::iterator super; ++ Ptr, ptrdiff_t, Ptr*, Ptr*> { ++ typedef std::iterator super; + typedef PredIterator Self; + USE_iterator It; + +@@ -40,6 +41,7 @@ + + public: + typedef typename super::pointer pointer; ++ typedef typename super::reference reference; + + PredIterator() {} + explicit inline PredIterator(Ptr *bb) : It(bb->use_begin()) { +@@ -50,7 +52,7 @@ + inline bool operator==(const Self& x) const { return It == x.It; } + inline bool operator!=(const Self& x) const { return !operator==(x); } + +- inline pointer operator*() const { ++ inline reference operator*() const { + assert(!It.atEnd() && "pred_iterator out of range!"); + return cast(*It)->getParent(); + } +@@ -100,10 +102,11 @@ + + template // Successor Iterator + class SuccIterator : public std::iterator { ++ BB_, ptrdiff_t, BB_*, BB_*> { + const Term_ Term; + unsigned idx; +- typedef std::iterator super; ++ typedef std::iterator super; + typedef SuccIterator Self; + + inline bool index_is_valid(int idx) { +@@ -112,6 +115,7 @@ + + public: + typedef typename super::pointer pointer; ++ typedef typename super::reference reference; + // TODO: This can be random access iterator, only operator[] missing. + + explicit inline SuccIterator(Term_ T) : Term(T), idx(0) {// begin iterator +@@ -142,7 +146,7 @@ + inline bool operator==(const Self& x) const { return idx == x.idx; } + inline bool operator!=(const Self& x) const { return !operator==(x); } + +- inline pointer operator*() const { return Term->getSuccessor(idx); } ++ inline reference operator*() const { return Term->getSuccessor(idx); } + inline pointer operator->() const { return operator*(); } + + inline Self& operator++() { ++idx; return *this; } // Preincrement