From ee7a9ef36108e70ea5bf856b0dac4ec42a4ed8c1 Mon Sep 17 00:00:00 2001
From: suvari <suvarice@gmail.com>
Date: Sat, 5 Jun 2021 22:52:45 +0300
Subject: [PATCH] llvm: fix typo

---
 programming/build/llvm/actions.py       | 37 +++++++++--------
 programming/build/llvm/pspec.xml        | 54 ++++++++++++++++---------
 programming/build/llvm/translations.xml |  4 +-
 3 files changed, 57 insertions(+), 38 deletions(-)

diff --git a/programming/build/llvm/actions.py b/programming/build/llvm/actions.py
index 3efbc8e98c..b8a7dc901f 100644
--- a/programming/build/llvm/actions.py
+++ b/programming/build/llvm/actions.py
@@ -28,7 +28,7 @@ def setup():
     #pisitools.cxxflags.remove("-D_FORTIFY_SOURCE=2")
     #shelltools.export("CC", "clang")
     #shelltools.export("CXX", "clang++")
-    
+
 
     if get.buildTYPE() == "emul32":
         shelltools.export("CC", "gcc -m32")
@@ -36,7 +36,7 @@ def setup():
         #shelltools.export("CC", "clang -m32")
         #shelltools.export("CXX", "clang++ -m32")
         shelltools.export("PKG_CONFIG_PATH","/usr/lib32/pkgconfig")
-        
+
         #clang patch
         #shelltools.cd("tools")
         #shelltools.system("patch -p1 < enable-SSP-and-PIE-by-default.patch")
@@ -48,28 +48,28 @@ def setup():
         #shelltools.export("CXX", "clang++")
 
     shelltools.makedirs("build")
-    
+
     shelltools.cd("build")
-    
+
     if get.buildTYPE() != "emul32":
         pisitools.cflags.add("-m64 ")
         pisitools.cxxflags.add("-m64")
         options = "-DLLVM_TARGET_ARCH:STRING=x86_64 \
                    -DLLDB_ENABLE_LUA=OFF \
                    -DLLVM_DEFAULT_TARGET_TRIPLE=%s " % get.HOST()
-                          
-    
+
+
     if get.buildTYPE() == "emul32":
         shelltools.export("CC", "gcc -m32")
         shelltools.export("CXX", "g++ -m32")
         #pisitools.cflags.add("-m32 ")
-        #pisitools.cxxflags.add("-m32")        
+        #pisitools.cxxflags.add("-m32")
         shelltools.export("PKG_CONFIG_PATH","/usr/lib32/pkgconfig")
         options = "  -DCMAKE_INSTALL_PREFIX=/emul32 \
                      -DLLVM_TARGET_ARCH:STRING=i686  \
                      -DLLVM_DEFAULT_TARGET_TRIPLE='i686-pc-linux-gnu'"
-    
-    
+
+
     cmaketools.configure("-DCMAKE_BUILD_TYPE=Release \
                           -G 'Unix Makefiles' \
                           %s \
@@ -79,12 +79,15 @@ def setup():
                           -DLLVM_BUILD_DOCS=OFF \
                           -DLLVM_ENABLE_RTTI=ON \
                           -DLLVM_ENABLE_EH=ON \
-                          -DBUILD_SHARED_LIBS=ON \ \
+                          -DLLVM_BUILD_LLVM_DYLIB=ON \
+                          -DLLVM_LINK_LLVM_DYLIB=ON \
+                          -DLLVM_ENABLE_SPHINX=ON \
                           -DLLDB_USE_SYSTEM_SIX=1 \
                           -DLLVM_INCLUDEDIR=/usr/include \
                           -DLLVM_ENABLE_ASSERTIONS=OFF \
                           -DFFI_INCLUDE_DIR=/usr/include \
-                          -DCOMPILER_RT_USE_LIBCXX=OFF" % (options, projects, libsuffix), sourceDir=".." ) 
+                          -DLLVM_BINUTILS_INCDIR=/usr/include \
+                          -DCOMPILER_RT_USE_LIBCXX=OFF" % (options, projects, libsuffix), sourceDir=".." )
 
 def build():
     shelltools.cd("build")
@@ -95,14 +98,16 @@ def install():
     shelltools.cd("build")
     #shelltools.system("DESTDIR=%s ninja install" % get.installDIR())
     cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
-        
-    if get.buildTYPE() == "emul32":        
+
+    if get.buildTYPE() == "emul32":
         pisitools.domove("/emul32/lib32/", "/usr/")
         pisitools.insinto("/usr/include/llvm/Config/","%s/emul32/include/llvm/Config/llvm-config.h" % get.installDIR(),"llvm-config-32.h")
         pisitools.insinto("/usr/bin/","%s/emul32/bin/llvm-config" % get.installDIR(),"llvm-config-32")
+        pisitools.dosym("/usr/lib/LLVMgold.so", "/usr/lib/bfd-plugins/LLVMgold.so")
+        pisitools.dosym("/usr/lib32/LLVMgold.so", "/usr/lib32/bfd-plugins/LLVMgold.so")
         pisitools.removeDir("/emul32")
-        pisitools.remove("/usr/lib/python3.8/site-packages/six.py")
-   
+        #pisitools.remove("/usr/lib/python3.8/site-packages/six.py")
+
     shelltools.cd ("..")
-    
+
     pisitools.dodoc("LICENSE.TXT", "README.txt")
diff --git a/programming/build/llvm/pspec.xml b/programming/build/llvm/pspec.xml
index e519c718b0..6c89e3d3d9 100755
--- a/programming/build/llvm/pspec.xml
+++ b/programming/build/llvm/pspec.xml
@@ -24,12 +24,13 @@
             <Dependency>libedit-devel</Dependency>
             <Dependency versionFrom="3.18.3">cmake</Dependency>
             <Dependency versionFrom="3.8.6">python3-devel</Dependency>
+            <Dependency>python3-sphinx</Dependency>
             <!-- Use new plugin-api.h header file from binutils to enable LLVM gold plugin -->
             <Dependency>binutils</Dependency>
             <Dependency>gcc</Dependency>
 <!--            <Dependency>llvm</Dependency>
             <Dependency>llvm-clang-devel</Dependency>
-            <Dependency>lld</Dependency> 
+            <Dependency>lld</Dependency>
             <Dependency>llvm-polly</Dependency> -->
         </BuildDependencies>
         <!--<AdditionalFiles>
@@ -42,7 +43,7 @@
         </Patches>
     </Source>
 
-    <Package>
+     <Package>
         <Name>llvm</Name>
         <IsA>app:console</IsA>
         <IsA>library</IsA>
@@ -51,7 +52,6 @@
             <Dependency>zlib</Dependency>
             <Dependency>libgcc</Dependency>
             <Dependency>ncurses</Dependency>
-            <Dependency>llvm-polly</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin</Path>
@@ -81,7 +81,6 @@
             <Dependency>libgcc</Dependency>
             <Dependency>ncurses</Dependency>
             <Dependency>libxml2</Dependency>
-            <Dependency>llvm-polly</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib/libLLVM*.so</Path>
@@ -93,7 +92,7 @@
             <Path fileType="data">/usr/share/licenses/llvm-libs/LICENSE</Path>
         </Files>
     </Package>
-    
+
     <Package>
         <Name>lldb</Name>
         <Summary>Next generation, high-performance debugger</Summary>
@@ -104,8 +103,7 @@
             <Dependency>libedit</Dependency>
             <Dependency>libxml2</Dependency>
             <Dependency>ncurses</Dependency>
-            <Dependency>python3</Dependency>            
-            <Dependency>llvm-polly</Dependency>
+            <Dependency>python3</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin/argdumper</Path>
@@ -138,14 +136,13 @@
         <RuntimeDependencies>
             <Dependency release="current">llvm-libs</Dependency>
             <Dependency>libgcc</Dependency>
-            <Dependency>llvm-polly</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin/ld.lld</Path>
             <Path fileType="executable">/usr/bin/ld64.lld</Path>
             <Path fileType="executable">/usr/bin/lld</Path>
             <Path fileType="executable">/usr/bin/lld-link</Path>
-            <Path fileType="executable">/usr/bin/wasm-ld</Path>		
+            <Path fileType="executable">/usr/bin/wasm-ld</Path>
             <Path fileType="library">/usr/lib/liblldMachO2.so*</Path>
             <Path fileType="library">/usr/lib/liblldCOFF.*</Path>
             <Path fileType="library">/usr/lib/liblldCommon.*</Path>
@@ -193,7 +190,7 @@
             <Path fileType="man">/usr/share/man/man1/scan-build.1</Path>
         </Files>
     </Package>
-	
+
     <Package>
         <Name>compiler-rt</Name>
         <Summary>Various runtime libraries used by Clang</Summary>
@@ -201,7 +198,15 @@
             <Dependency>libgcc</Dependency>
         </RuntimeDependencies>
         <Files>
-            <Path fileType="library">/usr/lib/clang/11.1.0/lib/linux/*.so</Path>
+            <Path fileType="executable">/usr/lib/clang/12.0.0/bin</Path>
+            <Path fileType="header">/usr/lib/clang/12.0.0/include/xray</Path>
+            <Path fileType="header">/usr/lib/clang/12.0.0/include/fuzzer</Path>
+            <Path fileType="header">/usr/lib/clang/12.0.0/include/sanitizer</Path>
+            <Path fileType="data">/usr/lib/clang/12.0.0/share</Path>
+            <Path fileType="library">/usr/lib/clang/12.0.0/lib/linux/*.a</Path>
+            <Path fileType="library">/usr/lib/clang/12.0.0/lib/linux/*.a.*</Path>
+            <Path fileType="library">/usr/lib/clang/12.0.0/lib/linux/*.o</Path>
+            <Path fileType="library">/usr/lib/clang/12.0.0/lib/linux/*.so</Path>
         </Files>
     </Package>
 
@@ -213,7 +218,6 @@
             <Dependency release="current">llvm-libs</Dependency>
             <Dependency>libxml2</Dependency>
             <Dependency>libgcc</Dependency>
-            <Dependency>llvm-polly</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin/diagtool</Path>
@@ -233,6 +237,18 @@
         </Files>
     </Package>
 
+    <Package>
+        <Name>llvm-clang-32bit</Name>
+        <Summary>A C language family front-end for LLVM</Summary>
+        <Description>The goal of the Clang project is to create a new C, C++, Objective C and Objective C++ front-end for the LLVM compiler.</Description>
+        <Files>
+            <Path fileType="library">/usr/lib32/libclang*</Path>
+            <Path fileType="library">/usr/lib32/clang/</Path>
+            <Path fileType="library">/usr/lib32/libfindAllSymbols.so*</Path>
+            <Path fileType="data">/usr/lib32/cmake/clang/Clang*</Path>
+        </Files>
+    </Package>
+
     <Package>
         <Name>llvm-clang-devel</Name>
         <Summary>Development headers for llvm-clang</Summary>
@@ -241,12 +257,12 @@
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include/clang</Path>
-            <Path fileType="header">/usr/lib/clang/11.0.0/include</Path>
+            <Path fileType="header">/usr/lib/clang/12.0.0/include</Path>
             <Path fileType="header">/usr/include/clang-c</Path>
             <Path fileType="header">/usr/include/clang-tidy</Path>
         </Files>
     </Package>
-    
+
     <Package>
         <Name>llvm-mlir</Name>
         <Summary>MLIR is intended to be a hybrid IR which can support multiple different requirements in a unified infrastructure</Summary>
@@ -254,7 +270,6 @@
             <Dependency release="current">llvm-libs</Dependency>
             <Dependency>libgcc</Dependency>
             <Dependency>ncurses</Dependency>
-            <Dependency>llvm-polly</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin/mlir*</Path>
@@ -264,7 +279,7 @@
             <Path fileType="data">/usr/lib/cmake/mlir</Path>
         </Files>
     </Package>
-    
+
     <Package>
         <Name>llvm-polly</Name>
         <Summary>High-level loop and data-locality optimizer and optimization infrastructure for LLVM</Summary>
@@ -273,12 +288,12 @@
         </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib/LLVMPolly.so</Path>
-            <Path fileType="library">/usr/lib/libPolly*.so*</Path>
+            <Path fileType="library">/usr/lib/libPolly*.a*</Path>
             <Path fileType="header">/usr/include/polly</Path>
             <Path fileType="data">/usr/lib/cmake/polly</Path>
         </Files>
     </Package>
-	
+
     <!--Package>
         <Name>llvm-docs</Name>
         <PartOf>programming.docs</PartOf>
@@ -300,16 +315,15 @@
             <Dependency>libffi-32bit</Dependency>
             <Dependency>libxml2-32bit</Dependency>
             <Dependency>ncurses-32bit</Dependency>
-<!--             <Dependency>libcxx-32bit</Dependency>  -->
         </BuildDependencies>
         <RuntimeDependencies>
             <Dependency release="current">llvm</Dependency>
+            <Dependency release="current">llvm-clang-32bit</Dependency>
             <Dependency>libgcc</Dependency>
             <Dependency>libxml2-32bit</Dependency>
             <Dependency>ncurses-32bit</Dependency>
             <Dependency>zlib-32bit</Dependency>
             <Dependency>libffi-32bit</Dependency>
-<!--             <Dependency>libcxx-32bit</Dependency>  -->
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin/llvm-config-32</Path>
diff --git a/programming/build/llvm/translations.xml b/programming/build/llvm/translations.xml
index 7ebd970163..ed2dd1293d 100644
--- a/programming/build/llvm/translations.xml
+++ b/programming/build/llvm/translations.xml
@@ -26,8 +26,8 @@
         <Summary xml:lang="tr">llvm-clang için başlık dosyaları</Summary>
     </Package>
 
-    <Package>
+<!--     <Package>
         <Name>llvm-docs</Name>
         <Summary xml:lang="tr">LLVM belgeleri</Summary>
-    </Package>
+    </Package> -->
 </PISI>