llvm: fix typo

2021-06-05 22:52:45 +03:00
parent 5ff6309fab
commit ee7a9ef361
3 changed files with 57 additions and 38 deletions
@@ -79,11 +79,14 @@ 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 \
+                          -DLLVM_BINUTILS_INCDIR=/usr/include \
                          -DCOMPILER_RT_USE_LIBCXX=OFF" % (options, projects, libsuffix), sourceDir=".." )

 def build():
@@ -100,8 +103,10 @@ def install():
        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 ("..")

@@ -24,6 +24,7 @@
            <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>
@@ -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>
@@ -105,7 +104,6 @@
            <Dependency>libxml2</Dependency>
            <Dependency>ncurses</Dependency>
            <Dependency>python3</Dependency>
-            <Dependency>llvm-polly</Dependency>
        </RuntimeDependencies>
        <Files>
            <Path fileType="executable">/usr/bin/argdumper</Path>
@@ -138,7 +136,6 @@
        <RuntimeDependencies>
            <Dependency release="current">llvm-libs</Dependency>
            <Dependency>libgcc</Dependency>
-            <Dependency>llvm-polly</Dependency>
        </RuntimeDependencies>
        <Files>
            <Path fileType="executable">/usr/bin/ld.lld</Path>
@@ -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,7 +257,7 @@
        </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>
@@ -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>
@@ -273,7 +288,7 @@
        </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>
@@ -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>
@@ -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>