Attachment 180150 Details for Bug 217236 – Fix clang35 build on __FreeBSD_version >= 1200017

[patch] Fix clang35 build on __FreeBSD_version >= 1200017

lang__clang35-fix-build-2.diff (text/plain), 3.44 KB, created by Dimitry Andric on 2017-02-19 19:33:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2017-02-19 19:33:37 UTC

Size: 3.44 KB

patch

obsolete

>Index: devel/llvm35/files/patch-svn-218295
>===================================================================
>--- devel/llvm35/files/patch-svn-218295	(nonexistent)
>+++ devel/llvm35/files/patch-svn-218295	(working copy)
>@@ -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>
>
>Property changes on: devel/llvm35/files/patch-svn-218295
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: lang/clang35/Makefile
>===================================================================
>--- lang/clang35/Makefile	(revision 434208)
>+++ lang/clang35/Makefile	(working copy)
>@@ -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}
> 
>Index: lang/clang35/files/patch-svn-218295
>===================================================================
>--- lang/clang35/files/patch-svn-218295	(nonexistent)
>+++ lang/clang35/files/patch-svn-218295	(working copy)
>@@ -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>
>
>Property changes on: lang/clang35/files/patch-svn-218295
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 217236: 180150