Bug 185366

Summary:

[patch] security/clamav: remove USE_GCC=any

Product:

Ports & Packages

Reporter:

Tijl Coosemans <tijl>

Component:

Individual Port(s)

Assignee:

Renato Botelho <garga>

Status:

Closed FIXED

Severity:

Affects Only Me

Priority:

Normal

Version:

Latest

Hardware:

Any

OS:

Any

Attachments:

Description	Flags
clamav.patch	none

Description Tijl Coosemans freebsd_committer

2013-12-31 12:00:00 UTC

The attached patch removes USE_GCC=any.  It also adds a new patch
to the port to make the bundled LLVM build with libc++.

The patch for libclamav/c++/llvm/include/llvm/Support/CFG.h is
LLVM revision 178240.  It is the same as patch-svn-r178240 in the
devel/llvm32 port.

Comment 1 Edwin Groothuis freebsd_committer

2013-12-31 12:00:09 UTC

Responsible Changed
From-To: freebsd-ports-bugs->garga

Over to maintainer (via the GNATS Auto Assign Tool)

Comment 2 Tijl Coosemans freebsd_committer

2013-12-31 13:01:58 UTC

> http://www.freebsd.org/cgi/query-pr.cgi?pr=185366

Tested on redports:
https://redports.org/buildarchive/20131231112101-35595/

Comment 3 dfilter service freebsd_committer

2014-01-07 18:54:16 UTC

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 <algorithm>
+ #include <cassert>
+ #include <cctype>
++#include <cstdlib>
+ 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 <class Ptr, class USE_iterator> // Predecessor Iterator
+ class PredIterator : public std::iterator<std::forward_iterator_tag,
+-                                          Ptr, ptrdiff_t> {
+-  typedef std::iterator<std::forward_iterator_tag, Ptr, ptrdiff_t> super;
++                                          Ptr, ptrdiff_t, Ptr*, Ptr*> {
++  typedef std::iterator<std::forward_iterator_tag, Ptr, ptrdiff_t, Ptr*,
++                                                                    Ptr*> super;
+   typedef PredIterator<Ptr, USE_iterator> 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<TerminatorInst>(*It)->getParent();
+   }
+@@ -100,10 +102,11 @@
+ 
+ template <class Term_, class BB_>           // Successor Iterator
+ class SuccIterator : public std::iterator<std::bidirectional_iterator_tag,
+-                                          BB_, ptrdiff_t> {
++                                          BB_, ptrdiff_t, BB_*, BB_*> {
+   const Term_ Term;
+   unsigned idx;
+-  typedef std::iterator<std::bidirectional_iterator_tag, BB_, ptrdiff_t> super;
++  typedef std::iterator<std::bidirectional_iterator_tag, BB_, ptrdiff_t, BB_*,
++                                                                    BB_*> super;
+   typedef SuccIterator<Term_, BB_> 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
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"

Comment 4 Renato Botelho freebsd_committer

2014-01-07 18:54:22 UTC

State Changed
From-To: open->closed

Committed. Thanks!

Comment 5 dfilter service freebsd_committer

2014-01-08 01:07:32 UTC

Author: garga
Date: Wed Jan  8 01:07:24 2014
New Revision: 339063
URL: http://svnweb.freebsd.org/changeset/ports/339063

Log:
  MFH: r339019
  
  - Add a patch to fix bundled LLVM to build with libc++
  - Remove USE_GCC=any
  
  PR:		ports/185366
  Submitted by:	tijl@
  Approved by:	portmgr-lurker (mat)

Added:
  branches/2014Q1/security/clamav/files/patch-libclamav-c++-llvm
     - copied unchanged from r339019, head/security/clamav/files/patch-libclamav-c++-llvm
Modified:
  branches/2014Q1/security/clamav/Makefile
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/security/clamav/Makefile
==============================================================================
--- branches/2014Q1/security/clamav/Makefile	Wed Jan  8 00:42:32 2014	(r339062)
+++ branches/2014Q1/security/clamav/Makefile	Wed Jan  8 01:07:24 2014	(r339063)
@@ -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
 

Copied: branches/2014Q1/security/clamav/files/patch-libclamav-c++-llvm (from r339019, head/security/clamav/files/patch-libclamav-c++-llvm)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/security/clamav/files/patch-libclamav-c++-llvm	Wed Jan  8 01:07:24 2014	(r339063, copy of r339019, head/security/clamav/files/patch-libclamav-c++-llvm)
@@ -0,0 +1,72 @@
+--- libclamav/c++/llvm/lib/Target/SubtargetFeature.cpp.orig
++++ libclamav/c++/llvm/lib/Target/SubtargetFeature.cpp
+@@ -18,6 +18,7 @@
+ #include <algorithm>
+ #include <cassert>
+ #include <cctype>
++#include <cstdlib>
+ 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 <class Ptr, class USE_iterator> // Predecessor Iterator
+ class PredIterator : public std::iterator<std::forward_iterator_tag,
+-                                          Ptr, ptrdiff_t> {
+-  typedef std::iterator<std::forward_iterator_tag, Ptr, ptrdiff_t> super;
++                                          Ptr, ptrdiff_t, Ptr*, Ptr*> {
++  typedef std::iterator<std::forward_iterator_tag, Ptr, ptrdiff_t, Ptr*,
++                                                                    Ptr*> super;
+   typedef PredIterator<Ptr, USE_iterator> 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<TerminatorInst>(*It)->getParent();
+   }
+@@ -100,10 +102,11 @@
+ 
+ template <class Term_, class BB_>           // Successor Iterator
+ class SuccIterator : public std::iterator<std::bidirectional_iterator_tag,
+-                                          BB_, ptrdiff_t> {
++                                          BB_, ptrdiff_t, BB_*, BB_*> {
+   const Term_ Term;
+   unsigned idx;
+-  typedef std::iterator<std::bidirectional_iterator_tag, BB_, ptrdiff_t> super;
++  typedef std::iterator<std::bidirectional_iterator_tag, BB_, ptrdiff_t, BB_*,
++                                                                    BB_*> super;
+   typedef SuccIterator<Term_, BB_> 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
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"