llvm fix trial

This commit is contained in:
Idris Kalp
2020-11-17 01:13:23 +03:00
parent 341d800646
commit a7fae4882e
2 changed files with 4 additions and 7 deletions
+2 -3
View File
@@ -9,7 +9,7 @@ from pisi.actionsapi import shelltools
from pisi.actionsapi import get
from pisi.actionsapi import cmaketools
projects = "clang;polly;compiler-rt;mlir" if get.buildTYPE() == "emul32" else "clang;clang-tools-extra;lld;lldb;polly;compiler-rt;mlir"
projects = "clang;compiler-rt;mlir" if get.buildTYPE() == "emul32" else "clang;clang-tools-extra;lld;lldb;polly;compiler-rt;mlir"
libdir = "/usr/lib32/llvm" if get.buildTYPE() == "emul32" else "/usr/lib/llvm"
lib = "lib32" if get.buildTYPE() == "emul32" else "lib"
libsuffix = "32" if get.buildTYPE() == "emul32" else ""
@@ -84,8 +84,7 @@ def install():
autotools.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")
+2 -4
View File
@@ -20,7 +20,6 @@
<Dependency>libffi-devel</Dependency>
<Dependency>groff</Dependency>
<Dependency>swig</Dependency>
<Dependency>python-devel</Dependency>
<Dependency>libedit-devel</Dependency>
<Dependency versionFrom="3.18.3">cmake</Dependency>
<Dependency versionFrom="3.8.6">python3-devel</Dependency>
@@ -29,7 +28,6 @@
<Dependency>gcc</Dependency>
<Dependency>llvm-clang</Dependency>
<Dependency>lld</Dependency>
<Dependency>ninja</Dependency>
</BuildDependencies>
<AdditionalFiles>
<AdditionalFile owner="root" permission="0644" target="tools/enable-SSP-and-PIE-by-default.patch">enable-SSP-and-PIE-by-default.patch</AdditionalFile>
@@ -103,7 +101,7 @@
<Dependency>libedit</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>ncurses</Dependency>
<Dependency>python</Dependency>
<Dependency>python3</Dependency>
<Dependency>libxml2</Dependency>
<Dependency>xz</Dependency>
</RuntimeDependencies>
@@ -142,7 +140,7 @@
<Dependency>libedit</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>ncurses</Dependency>
<Dependency>python</Dependency>
<Dependency>python3</Dependency>
<Dependency>libxml2</Dependency>
</RuntimeDependencies>
<Files>