svn commit: r434557 - in head: devel/llvm35/files lang/clang35 lang/clang35/files

[Brooks Davis]

Author: brooks
Date: Wed Feb 22 00:49:41 2017
New Revision: 434557
URL: https://svnweb.freebsd.org/changeset/ports/434557

Log:
  Fix build on recent HEAD.
  
  PR:		217236
  Submitted by:	dim

Added:
  head/devel/llvm35/files/patch-svn-218295   (contents, props changed)
  head/lang/clang35/files/patch-svn-218295   (contents, props changed)
Modified:
  head/lang/clang35/Makefile

Added: head/devel/llvm35/files/patch-svn-218295
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/llvm35/files/patch-svn-218295	Wed Feb 22 00:49:41 2017	(r434557)
@@ -0,0 +1,21 @@
+$FreeBSD$
+------------------------------------------------------------------------
+r218295 | akirtzidis | 2014-09-23 08:06:43 +0200 (Tue, 23 Sep 2014) | 2 lines
+
+[ADT/IntrusiveRefCntPtr] Give friend access to IntrusiveRefCntPtr<X> so the relevant move constructor can access 'Obj'.
+
+------------------------------------------------------------------------
+Index: include/llvm/ADT/IntrusiveRefCntPtr.h
+===================================================================
+--- include/llvm/ADT/IntrusiveRefCntPtr.h	(revision 218294)
++++ include/llvm/ADT/IntrusiveRefCntPtr.h	(revision 218295)
+@@ -197,6 +197,9 @@ public:
+   private:
+     void retain() { if (Obj) IntrusiveRefCntPtrInfo<T>::retain(Obj); }
+     void release() { if (Obj) IntrusiveRefCntPtrInfo<T>::release(Obj); }
++
++    template <typename X>
++    friend class IntrusiveRefCntPtr;
+   };
+ 
+   template<class T, class U>

Modified: head/lang/clang35/Makefile
==============================================================================
--- head/lang/clang35/Makefile	Tue Feb 21 22:02:51 2017	(r434556)
+++ head/lang/clang35/Makefile	Wed Feb 22 00:49:41 2017	(r434557)
@@ -85,10 +85,6 @@ RELTYPE=		Release
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1200017 && ${CHOSEN_COMPILER_TYPE} == "clang"
-BROKEN=	Base clang produces compiler errors
-.endif
-
 # keep in sync with /usr/src/lib/clang/clang.build.mk
 CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/armv6hf/armv6/}-portbld-${OPSYS:tl}${OSREL}
 

Added: head/lang/clang35/files/patch-svn-218295
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/clang35/files/patch-svn-218295	Wed Feb 22 00:49:41 2017	(r434557)
@@ -0,0 +1,21 @@
+$FreeBSD$
+------------------------------------------------------------------------
+r218295 | akirtzidis | 2014-09-23 08:06:43 +0200 (Tue, 23 Sep 2014) | 2 lines
+
+[ADT/IntrusiveRefCntPtr] Give friend access to IntrusiveRefCntPtr<X> so the relevant move constructor can access 'Obj'.
+
+------------------------------------------------------------------------
+Index: include/llvm/ADT/IntrusiveRefCntPtr.h
+===================================================================
+--- include/llvm/ADT/IntrusiveRefCntPtr.h	(revision 218294)
++++ include/llvm/ADT/IntrusiveRefCntPtr.h	(revision 218295)
+@@ -197,6 +197,9 @@ public:
+   private:
+     void retain() { if (Obj) IntrusiveRefCntPtrInfo<T>::retain(Obj); }
+     void release() { if (Obj) IntrusiveRefCntPtrInfo<T>::release(Obj); }
++
++    template <typename X>
++    friend class IntrusiveRefCntPtr;
+   };
+ 
+   template<class T, class U>