diff --git a/programming/build/llvm/actions.py b/programming/build/llvm/actions.py index c957567c2b..5852a0f32d 100755 --- a/programming/build/llvm/actions.py +++ b/programming/build/llvm/actions.py @@ -16,7 +16,7 @@ libsuffix = "32" if get.buildTYPE() == "emul32" else "" NoStrip = ["/usr/lib/clang/%s/lib/linux" % get.srcVERSION()] def setup(): - #pisitools.ldflags.add("-fuse-ld=lld") + pisitools.ldflags.add("-fuse-ld=lld") if get.buildTYPE() != "emul32": if not shelltools.can_access_directory("tools/clang"): @@ -39,19 +39,19 @@ def setup(): shelltools.system("tar xf ../compiler-rt-%s.src.tar.xz -C projects" % get.srcVERSION()) shelltools.move("projects/compiler-rt-%s.src" % get.srcVERSION(), "projects/compiler-rt") - #shelltools.export("CC", "clang") - #shelltools.export("CXX", "clang++") - shelltools.export("CC", "gcc") - shelltools.export("CXX", "g++") + shelltools.export("CC", "clang") + shelltools.export("CXX", "clang++") + #shelltools.export("CC", "gcc") + #shelltools.export("CXX", "g++") else: shelltools.system("tar xf ../clang-%s.src.tar.xz -C tools" % get.srcVERSION()) shelltools.move("tools/clang-%s.src" % get.srcVERSION(), "tools/clang") if get.buildTYPE() == "emul32": - #shelltools.export("CC", "clang -m32") - #shelltools.export("CXX", "clang++ -m32") - shelltools.export("CC", "gcc -m32") - shelltools.export("CXX", "g++ -m32") + shelltools.export("CC", "clang -m32") + shelltools.export("CXX", "clang++ -m32") + #shelltools.export("CC", "gcc -m32") + #shelltools.export("CXX", "g++ -m32") shelltools.export("PKG_CONFIG_PATH","/usr/lib32/pkgconfig") shelltools.makedirs("build") @@ -63,6 +63,7 @@ def setup(): -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_CXX_FLAGS:STRING=-m64 \ -DLLVM_TARGET_ARCH:STRING=x86_64 \ + -DLLDB_ENABLE_LUA=OFF \ -DLLVM_DEFAULT_TARGET_TRIPLE=%s " % get.HOST() diff --git a/programming/build/llvm/pspec.xml b/programming/build/llvm/pspec.xml index dd2873ed8c..a33a4e5091 100755 --- a/programming/build/llvm/pspec.xml +++ b/programming/build/llvm/pspec.xml @@ -32,8 +32,8 @@ binutils gcc - - + llvm-clang + lld @@ -95,6 +95,7 @@ Next generation, high-performance debugger llvm-libs + llvm-clang zlib libffi libedit @@ -102,6 +103,7 @@ ncurses python libxml2 + xz /usr/bin/argdumper @@ -205,6 +207,7 @@ A C language family front-end for LLVM The goal of the Clang project is to create a new C, C++, Objective C and Objective C++ front-end for the LLVM compiler. + llvm llvm-libs libgcc ncurses diff --git a/programming/language/rust/pspec.xml b/programming/language/rust/pspec.xml index cccccfa74b..d5061418f7 100755 --- a/programming/language/rust/pspec.xml +++ b/programming/language/rust/pspec.xml @@ -62,7 +62,7 @@ - 2020-03-26 + 2020-03-28 1.42.0 Version bump. Idris Kalp diff --git a/programming/library/cbindgen/pspec.xml b/programming/library/cbindgen/pspec.xml index f40aba5d6e..5b74101eae 100644 --- a/programming/library/cbindgen/pspec.xml +++ b/programming/library/cbindgen/pspec.xml @@ -14,7 +14,7 @@ Rust koduna C bağlamaları oluşturmak için bir araç https://github.com/eqrion/cbindgen/archive/v0.13.2.tar.gz - rust + rust llvm @@ -32,7 +32,7 @@ - 2020-03-26 + 2020-03-28 0.13.2 Version bump. Idris Kalp diff --git a/x11/library/libclc/actions.py b/x11/library/libclc/actions.py index cc7b34dfe3..4b37a5cf8b 100755 --- a/x11/library/libclc/actions.py +++ b/x11/library/libclc/actions.py @@ -4,19 +4,45 @@ # Licensed under the GNU General Public License, version 3. # See the file http://www.gnu.org/licenses/gpl.txt -from pisi.actionsapi import pythonmodules +from pisi.actionsapi import cmaketools from pisi.actionsapi import shelltools from pisi.actionsapi import pisitools from pisi.actionsapi import autotools from pisi.actionsapi import get +libdir = "/usr/lib32" if get.buildTYPE() == "emul32" else "/usr/lib" + def setup(): - shelltools.system("python ./configure.py --prefix=/usr") + + + + if get.buildTYPE() == "emul32": + shelltools.system("chmod +x clang32") + options = "-DLLVM_CLANG='%s/%s-%s/clang32' \ + -DLLVM_CONFIG='/usr/bin/llvm-config-32' \ + " % (get.workDIR(), get.srcNAME(), get.srcVERSION()) + else: + options = "-DLLVM_CLANG='/usr/bin/clang' \ + -DLLVM_CONFIG='/usr/bin/llvm-config' \ + " + + cmaketools.configure(options) def build(): - autotools.make() + cmaketools.make() def install(): autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + pisitools.domove("/usr/share/clc/", "%s" %libdir) + pisitools.domove("/usr/share/pkgconfig/libclc.pc", "%s/pkgconfig" % libdir) + + if get.buildTYPE() == "emul32": + shelltools.system("sed -i 's/\/usr\/share/\/usr\/lib32/' %s/usr/lib32/pkgconfig/libclc.pc" % get.installDIR()) + else: + shelltools.system("sed -i 's/\/usr\/share/\/usr\/lib/' %s/usr/lib/pkgconfig/libclc.pc" % get.installDIR()) + + #pisitools.removeDir("/usr/share/clc") + pisitools.removeDir("/usr/share/pkgconfig") + pisitools.dodoc("LICENSE*", "README*") diff --git a/x11/library/libclc/files/clang32 b/x11/library/libclc/files/clang32 new file mode 100644 index 0000000000..4f19456f19 --- /dev/null +++ b/x11/library/libclc/files/clang32 @@ -0,0 +1,3 @@ +#!/bin/sh + +/usr/bin/clang -m32 $@ diff --git a/x11/library/libclc/pspec.xml b/x11/library/libclc/pspec.xml index bc25046315..d41eeedbab 100755 --- a/x11/library/libclc/pspec.xml +++ b/x11/library/libclc/pspec.xml @@ -12,12 +12,15 @@ library Library requirements of the OpenCL C programming language Library requirements of the OpenCL C programming language - https://sourceforge.net/projects/pisilinux/files/source/libclc-r375507.tar.xz + https://sourceforge.net/projects/pisilinux/files/source/libclc-10.0.0_20200215.tar.xz llvm python-devel llvm-clang-devel + + clang32 + @@ -30,7 +33,16 @@ /usr/share/doc - + + + libclc-32bit + emul32 + emul32 + + /usr/lib32 + + + libclc-devel Development files for libclc @@ -40,13 +52,14 @@ /usr/include /usr/lib/pkgconfig + /usr/lib32/pkgconfig - 2020-01-05 - 9.0.1_375507 + 2020-03-26 + 10.0.0_20200215 First release İdris Kalp idriskalp@gmail.com diff --git a/x11/library/mesa/actions.py b/x11/library/mesa/actions.py index d566d17251..433cf8736e 100644 --- a/x11/library/mesa/actions.py +++ b/x11/library/mesa/actions.py @@ -41,15 +41,16 @@ def setup(): -Dbuild-tests=false \ -Dosmesa=gallium \ -Dswr-arches=avx,avx2 \ + -Dgallium-opencl=icd \ " % ((libdir, ) * 2) if get.buildTYPE() == "emul32": - options += " -Dlmsensors=false" + options += " -Dlmsensors=false --native-file crossfile.ini -Dllvm_libdir=/usr/lib32" shelltools.export("CC", "gcc -m32") shelltools.export("CXX", "g++ -m32") shelltools.export("PKG_CONFIG_PATH","/usr/lib32/pkgconfig") shelltools.export("LLVM_CONFIG","/usr/bin/llvm-config-32") - else: options += " -Dgallium-opencl=icd -Dgallium-omx=bellagio -Dlmsensors=true" + else: options += " -Dgallium-omx=bellagio -Dlmsensors=true" mesontools.configure(options) diff --git a/x11/library/mesa/files/crossfile.ini b/x11/library/mesa/files/crossfile.ini new file mode 100644 index 0000000000..63b8fc8a7e --- /dev/null +++ b/x11/library/mesa/files/crossfile.ini @@ -0,0 +1,2 @@ +[binaries] +llvm-config = '/usr/bin/llvm-config-32' diff --git a/x11/library/mesa/pspec.xml b/x11/library/mesa/pspec.xml index c248810c2a..8229411153 100644 --- a/x11/library/mesa/pspec.xml +++ b/x11/library/mesa/pspec.xml @@ -13,7 +13,7 @@ app:console Mesa graphics libraries and utilities Mesa is an open-source implementation of the OpenGL specification - a system for rendering interactive 3D graphics. - https://mesa.freedesktop.org/archive/mesa-19.3.5.tar.xz + https://mesa.freedesktop.org/archive/mesa-20.0.2.tar.xz meson zlib-devel @@ -55,6 +55,9 @@ libclc-devel lm_sensors-devel + + crossfile.ini + @@ -164,6 +167,7 @@ libXrandr-32bit libglvnd-32bit vulkan-32bit + libclc-32bit zlib-32bit @@ -188,7 +192,9 @@ libdrm-nouveau-32bit wayland-32bit vulkan-32bit + opencl-icd-32bit libglvnd-32bit + libclc-32bit libunwind-32bit mesa llvm-32bit @@ -200,19 +206,12 @@ - - 2020-03-10 - 19.3.5 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - 2020-01-11 - 19.3.2 + 2020-03-27 + 20.0.2 Version bump. - Mustafa Cinasal - muscnsl@gmail.com + İdris Kalp + idriskalp@gmail.com 2020-01-03