Date: Tue, 8 Oct 2013 14:59:56 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329791 - in head: devel/llvm31 devel/llvm31/files lang/clang31 Message-ID: <201310081459.r98ExuJm071525@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Tue Oct 8 14:59:55 2013 New Revision: 329791 URL: http://svnweb.freebsd.org/changeset/ports/329791 Log: Remove USE_GCC=4.2+ and fix build with libc++ by importing upstream r178240. Approved by: brooks (maintainer) Added: head/devel/llvm31/files/patch-svn-r178240 (contents, props changed) Modified: head/devel/llvm31/Makefile head/lang/clang31/Makefile Modified: head/devel/llvm31/Makefile ============================================================================== --- head/devel/llvm31/Makefile Tue Oct 8 14:54:40 2013 (r329790) +++ head/devel/llvm31/Makefile Tue Oct 8 14:59:55 2013 (r329791) @@ -3,6 +3,7 @@ PORTNAME= llvm31 PORTVERSION= 3.1 +PORTREVISION= 1 CATEGORIES= devel lang MASTER_SITES= http://llvm.org/releases/${PORTVERSION}/ DISTNAME= llvm-${PORTVERSION}.src @@ -22,7 +23,6 @@ CONFLICTS= llvm-[3]* llvm-devel-[23]* ll USES= gmake perl5 GNU_CONFIGURE= yes -USE_GCC= 4.2+ USE_LDCONFIG= yes USE_PYTHON_BUILD= yes Added: head/devel/llvm31/files/patch-svn-r178240 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/llvm31/files/patch-svn-r178240 Tue Oct 8 14:59:55 2013 (r329791) @@ -0,0 +1,62 @@ +--- include/llvm/Support/CFG.h 2013/01/02 11:36:10 171366 ++++ include/llvm/Support/CFG.h 2013/03/28 15:47:50 178240 +@@ -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 Modified: head/lang/clang31/Makefile ============================================================================== --- head/lang/clang31/Makefile Tue Oct 8 14:54:40 2013 (r329790) +++ head/lang/clang31/Makefile Tue Oct 8 14:59:55 2013 (r329791) @@ -3,6 +3,7 @@ PORTNAME= clang31 PORTVERSION= 3.1 +PORTREVISION= 1 CATEGORIES= lang devel MASTER_SITES= http://llvm.org/releases/${PORTVERSION}/ DISTNAME= clang-${PORTVERSION}.src @@ -35,7 +36,6 @@ BUILD_DEPENDS+= f2c:${PORTSDIR}/lang/f2c GNU_CONFIGURE= yes USES= gmake perl5 -USE_GCC= 4.2+ USE_LDCONFIG= yes USE_PYTHON= yes
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310081459.r98ExuJm071525>