From a7fae4882eefa3cb9071e517aa0f6346dd9e4526 Mon Sep 17 00:00:00 2001 From: Idris Kalp Date: Tue, 17 Nov 2020 01:13:23 +0300 Subject: [PATCH] llvm fix trial --- programming/build/llvm/actions.py | 5 ++--- programming/build/llvm/pspec.xml | 6 ++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/programming/build/llvm/actions.py b/programming/build/llvm/actions.py index 0552f15bd0..70dcfd1eae 100755 --- a/programming/build/llvm/actions.py +++ b/programming/build/llvm/actions.py @@ -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") diff --git a/programming/build/llvm/pspec.xml b/programming/build/llvm/pspec.xml index e32bc38d67..4819ec566a 100755 --- a/programming/build/llvm/pspec.xml +++ b/programming/build/llvm/pspec.xml @@ -20,7 +20,6 @@ libffi-devel groff swig - python-devel libedit-devel cmake python3-devel @@ -29,7 +28,6 @@ gcc llvm-clang lld - ninja enable-SSP-and-PIE-by-default.patch @@ -103,7 +101,7 @@ libedit libgcc ncurses - python + python3 libxml2 xz @@ -142,7 +140,7 @@ libedit libgcc ncurses - python + python3 libxml2