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