This patch was downloaded from https://sft.its.cern.ch/jira/browse/ROOT-7047.
It fixes the build of clang 3.5 with GCC 5.  File paths have been adjusted.

From 00f3ed6eee41da871799ad0fd19153c7682d61fe Mon Sep 17 00:00:00 2001
From: Alexander Klimov <alserkli@inbox.ru>
Date: Mon, 26 Jan 2015 18:45:23 +0200
Subject: [PATCH] [ADT/IntrusiveRefCntPtr] Give friend access to
 IntrusiveRefCntPtr<X> so the relevant move constructor can
 access 'Obj'.

From LLVM upstream:
Author: Argyrios Kyrtzidis <akyrtzi@gmail.com>
Date:   Tue Sep 23 06:06:43 2014 +0000
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@218295 91177308-0d34-0410-b5e6-96231b3b80d8
---
 interpreter/llvm/src/include/llvm/ADT/IntrusiveRefCntPtr.h |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/llvm/ADT/IntrusiveRefCntPtr.h b/include/llvm/ADT/IntrusiveRefCntPtr.h
index f9df378..c859c98 100644
--- a/include/llvm/ADT/IntrusiveRefCntPtr.h
+++ b/include/llvm/ADT/IntrusiveRefCntPtr.h
@@ -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>
-- 
1.7.10.4

fb971fda9206f14cf46d072e04e27fd43'>tree</a><a href='/guix/commit/doc/he-config-bare-bones.scm?id=83598dafb971fda9206f14cf46d072e04e27fd43'>commit</a><a href='/guix/diff/doc/he-config-bare-bones.scm?id=83598dafb971fda9206f14cf46d072e04e27fd43'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/doc/he-config-bare-bones.scm'>
<input type='hidden' name='id' value='83598dafb971fda9206f14cf46d072e04e27fd43'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=83598dafb971fda9206f14cf46d072e04e27fd43'>root</a>/<a href='/guix/log/doc?id=83598dafb971fda9206f14cf46d072e04e27fd43'>doc</a>/<a href='/guix/log/doc/he-config-bare-bones.scm?id=83598dafb971fda9206f14cf46d072e04e27fd43'>he-config-bare-bones.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/doc/he-config-bare-bones.scm?id=83598dafb971fda9206f14cf46d072e04e27fd43&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-06-10 22:42:49 +0200'>2022-06-10</span></td><td><a href='/guix/commit/doc/he-config-bare-bones.scm?id=d859d8873ceb3c591210968cfd4c88e26fc89edc'>doc: Update example of a minimalistic home environment.</a><span class='msg-avail'>...<span class='msg-tooltip'>* doc/he-config-bare-bones.scm: Adujst example according to changes in
bash-service-type and home-files-service-type.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Andrew Tropin</td></tr>
<tr><td><span title='2021-10-09 19:24:18 +0300'>2021-10-09</span></td><td><a href='/guix/commit/doc/he-config-bare-bones.scm?id=0e8d2df0f1a4ab25c482e1c427c54e19903e62f3'>Move (gnu home-services) to (gnu home services).</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/home-services.scm (%guix-home-root-directory): Replace
gnu/home-services.scm with "gnu/home/services.scm".
Rename to gnu/home/services.scm.
* gnu/local.mk
(GNU_SYSTEM_MODULES): Rename gnu/home-services.scm to gnu/home/services.scm.
* doc/he-config-bare-bones.scm:
Replace (gnu home-services) with (gnu home services).
* gnu/home.scm: Same.
* gnu/home/services/fontutils.scm: Same.
* gnu/home/services/mcron.scm: Same.
* gnu/home/services/shells.scm: Same.
* gnu/home/services/shepherd.scm: Same.
* gnu/home/services/symlink-manager.scm: Same.
* gnu/home/services/xdg.scm: Same.
* guix/scripts/home.scm: Same.
* guix/self.scm: Same.
</span></span></td><td>Oleg Pykhalov</td></tr>
<tr><td><span title='2021-10-08 15:36:18 +0300'>2021-10-08</span></td><td><a href='/guix/commit/doc/he-config-bare-bones.scm?id=ba8ddb348045f81f061a1c7f51c0f7c2b0024e71'>gnu: Move (gnu home-services) to (gnu home services).</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/home-services/configuration.scm: Move the content ...
* gnu/home/services/configuration.scm: ... here.
* doc/guix.texi:
Replace (gnu home-services mcron) with (gnu home services mcron).
Replace (gnu home-services) with (gnu home services).
* gnu/home.scm:
Replace (gnu home-services fontutils) with (gnu services fontutils).
Replace (gnu home-services shells) with (gnu home services shells).
Replace (gnu home-services symlink-manager) with
(gnu home services symlink-manager).
Replace (gnu home-services xdg) with (gnu home services xdg).
* gnu/home-services/fontutils.scm: Rename to gnu/services/fontutils.scm.
* gnu/home-services/mcron.scm: Move to gnu/home/services/mcron.scm.
Replace (gnu home-services shepherd) with (gnu home services shepherd).
* gnu/home-services.scm (%service-type-path):
Search home services in "gnu/services".
* gnu/home-services/shells.scm: Replace (gnu home-services configuration) with
(gnu home services configuration).
Rename to gnu/home/services/shells.scm.
Replace (gnu home-services utils) with (gnu home services utils).
* gnu/home-services/shepherd.scm: Move to gnu/home/services/shepherd.scm.
* gnu/home-services/symlink-manager.scm:
Rename to gnu/home/services/symlink-manager.scm.
* gnu/home-services/utils.scm: Rename to gnu/home/services/utils.scm.
* gnu/home-services/xdg.scm: Rename to gnu/home/services/xdg.scm.
* guix/scripts/home/import.scm:
Replace (gnu home-services bash) with (gnu home services bash).
* gnu/home-services.scm: Update documentation string.
* doc/he-config-bare-bones.scm:
Apply new (gnu home-services ...) modules location.
* gnu/local.mk (GNU_SYSTEM_MODULES): Same.
</span></span></td><td>Oleg Pykhalov</td></tr>
<tr><td><span title='2021-09-09 20:26:51 +0300'>2021-09-09</span></td><td><a href='/guix/commit/doc/he-config-bare-bones.scm?id=aaffa43c1752e062934580f55616e0380963a1be'>doc: Add Guix Home documentation.</a><span class='msg-avail'>...<span class='msg-tooltip'>* doc/guix.texi: Add Guix Home documentation.
* doc/he-config-bare-bones.scm: New file.

Signed-off-by: Oleg Pykhalov &lt;go.wigust@gmail.com&gt;
</span></span></td><td>Andrew Tropin</td></tr>