From e7063be444383bf493a0a6121fbe67d5f3fc0ff4 Mon Sep 17 00:00:00 2001
From: suvari <suvarice@gmail.com>
Date: Sat, 21 Oct 2023 22:52:59 +0300
Subject: [PATCH] llvm: fix conflicts

---
 programming/build/llvm/pspec.xml | 72 +++++++++++++++++++++++++++++---
 1 file changed, 67 insertions(+), 5 deletions(-)

diff --git a/programming/build/llvm/pspec.xml b/programming/build/llvm/pspec.xml
index 928856a4eb..a97075412e 100755
--- a/programming/build/llvm/pspec.xml
+++ b/programming/build/llvm/pspec.xml
@@ -55,7 +55,69 @@
         <Files>
             <Path fileType="executable">/usr/bin</Path>
             <Path fileType="executable">/usr/bin/llvm-config</Path>
-            <Path fileType="header">/usr/include/llvm*</Path>
+            <Path fileType="header">/usr/include/llvm-c</Path>
+            <Path fileType="header">/usr/include/llvm/PassInfo.h</Path>
+            <Path fileType="header">/usr/include/llvm/PassAnalysisSupport.h</Path>
+            <Path fileType="header">/usr/include/llvm/LinkAllPasses.h</Path>
+            <Path fileType="header">/usr/include/llvm/PassSupport.h</Path>
+            <Path fileType="header">/usr/include/llv/usr/include/llvm/LinkAllIR.hm*</Path>
+            <Path fileType="header">/usr/include/llvm/Pass.h</Path>
+            <Path fileType="header">/usr/include/llvm/PassRegistry.h</Path>
+            <Path fileType="header">/usr/include/llvm/InitializePasses.h</Path>
+            <Path fileType="header">/usr/include/llvm/IR</Path>
+            <Path fileType="header">/usr/include/llvm/MC</Path>
+            <Path fileType="header">/usr/include/llvm/Linker</Path>
+            <Path fileType="header">/usr/include/llvm/Object</Path>
+            <Path fileType="header">/usr/include/llvm/DWARFLinkerParallel</Path>
+            <Path fileType="header">/usr/include/llvm/DWARFLinker</Path>
+            <Path fileType="header">/usr/include/llvm/Remarks</Path>
+            <Path fileType="header">/usr/include/llvm/FileCheck</Path>
+            <Path fileType="header">/usr/include/llvm/LineEditor</Path>
+            <Path fileType="header">/usr/include/llvm/Testing</Path>
+            <Path fileType="header">/usr/include/llvm/Option</Path>
+            <Path fileType="header">/usr/include/llvm/InterfaceStub</Path>
+            <Path fileType="header">/usr/include/llvm/ToolDrivers</Path>
+            <Path fileType="header">/usr/include/llvm/ObjCopy</Path>
+            <Path fileType="header">/usr/include/llvm/Demangle</Path>
+            <Path fileType="header">/usr/include/llvm/FuzzMutate</Path>
+            <Path fileType="header">/usr/include/llvm/Bitcode</Path>
+            <Path fileType="header">/usr/include/llvm/ProfileData</Path>
+            <Path fileType="header">/usr/include/llvm/DebugInfo</Path>
+            <Path fileType="header">/usr/include/llvm/Passes</Path>
+            <Path fileType="header">/usr/include/llvm/Frontend</Path>
+            <Path fileType="header">/usr/include/llvm/WindowsResource</Path>
+            <Path fileType="header">/usr/include/llvm/MCA</Path>
+            <Path fileType="header">/usr/include/llvm/Target</Path>
+            <Path fileType="header">/usr/include/llvm/Bitstream</Path>
+            <Path fileType="header">/usr/include/llvm/ExecutionEngine</Path>
+            <Path fileType="header">/usr/include/llvm/CodeGen</Path>
+            <Path fileType="header">/usr/include/llvm/WindowsDriver</Path>
+            <Path fileType="header">/usr/include/llvm/Debuginfod</Path>
+            <Path fileType="header">/usr/include/llvm/TableGen</Path>
+            <Path fileType="header">/usr/include/llvm/IRReader</Path>
+            <Path fileType="header">/usr/include/llvm/LTO</Path>
+            <Path fileType="header">/usr/include/llvm/TargetParser</Path>
+            <Path fileType="header">/usr/include/llvm/AsmParser</Path>
+            <Path fileType="header">/usr/include/llvm/TextAPI</Path>
+            <Path fileType="header">/usr/include/llvm/Transforms</Path>
+            <Path fileType="header">/usr/include/llvm/XRay</Path>
+            <Path fileType="header">/usr/include/llvm/BinaryFormat</Path>
+            <Path fileType="header">/usr/include/llvm/WindowsManifest</Path>
+            <Path fileType="header">/usr/include/llvm/Support</Path>
+            <Path fileType="header">/usr/include/llvm/DWP</Path>
+            <Path fileType="header">/usr/include/llvm/IRPrinter</Path>
+            <Path fileType="header">/usr/include/llvm/ObjectYAML</Path>
+            <Path fileType="header">/usr/include/llvm/Analysis</Path>
+            <Path fileType="header">/usr/include/llvm/ADT</Path>
+            <Path fileType="header">/usr/include/llvm/LinkAllIR.h</Path>
+            <Path fileType="header">/usr/include/llvm/Config/llvm-config.h</Path>
+            <Path fileType="header">/usr/include/llvm/Config/Targets.def</Path>
+            <Path fileType="header">/usr/include/llvm/Config/AsmPrinters.def</Path>
+            <Path fileType="header">/usr/include/llvm/Config/TargetExegesis.def</Path>
+            <Path fileType="header">/usr/include/llvm/Config/TargetMCAs.def</Path>
+            <Path fileType="header">/usr/include/llvm/Config/Disassemblers.def</Path>
+            <Path fileType="header">/usr/include/llvm/Config/AsmParsers.def</Path>
+            <Path fileType="header">/usr/include/llvm/Config/abi-breaking.h</Path>
             <Path fileType="library">/usr/lib/llvm</Path>
             <Path fileType="library">/usr/lib</Path>
             <Path fileType="conf">/etc/ld.so.conf.d</Path>
@@ -212,17 +274,17 @@
         </Files>
     </Package>
 
-    <Package>
+<!--     <Package>
         <Name>llvm-unwind</Name>
         <Summary>LLVM unwinding library</Summary>
-<!--        <RuntimeDependencies>
+       <RuntimeDependencies>
             <Dependency>libgcc</Dependency>
-        </RuntimeDependencies>-->
+        </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib/libllvm-unwind*</Path>
             <Path fileType="library">/usr/lib/llvm-libunwind</Path>
         </Files>
-    </Package>
+    </Package> -->
 
     <Package>
         <Name>llvm-clang</Name>