Merge branch 'master' of github.com:pisilinux/main

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("CC", "clang")
-                #shelltools.export("CXX", "clang++")
+                shelltools.export("CXX", "clang++")
-                shelltools.export("CC", "gcc")
+                #shelltools.export("CC", "gcc")
-                shelltools.export("CXX", "g++")
+                #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("CC", "clang -m32")
-        #shelltools.export("CXX", "clang++ -m32")
+        shelltools.export("CXX", "clang++ -m32")
-        shelltools.export("CC", "gcc -m32")
+        #shelltools.export("CC", "gcc -m32")
-        shelltools.export("CXX", "g++ -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()
                           
     

programming/build/llvm/pspec.xml

@@ -32,8 +32,8 @@
             <!-- Use new plugin-api.h header file from binutils to enable LLVM gold plugin -->
             <Dependency>binutils</Dependency>
             <Dependency>gcc</Dependency>
-<!--             <Dependency>llvm-clang</Dependency>	 -->
+            <Dependency>llvm-clang</Dependency>	 
-<!--             <Dependency>lld</Dependency>			 -->
+            <Dependency>lld</Dependency>			 
         </BuildDependencies>
     </Source>
 
@@ -95,6 +95,7 @@
         <Summary>Next generation, high-performance debugger</Summary>
         <RuntimeDependencies>
             <Dependency release="current">llvm-libs</Dependency>
+            <Dependency release="current">llvm-clang</Dependency>
             <Dependency>zlib</Dependency>
             <Dependency>libffi</Dependency>
             <Dependency>libedit</Dependency>
@@ -102,6 +103,7 @@
             <Dependency>ncurses</Dependency>
             <Dependency>python</Dependency>
             <Dependency>libxml2</Dependency>
+            <Dependency>xz</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin/argdumper</Path>
@@ -205,6 +207,7 @@
         <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>
         <RuntimeDependencies>
+            <Dependency release="current">llvm</Dependency>
             <Dependency release="current">llvm-libs</Dependency>
             <Dependency>libgcc</Dependency>
             <Dependency>ncurses</Dependency>

programming/language/rust/pspec.xml

@@ -62,7 +62,7 @@
 
     <History>
         <Update release="13">
-            <Date>2020-03-26</Date>
+            <Date>2020-03-28</Date>
             <Version>1.42.0</Version>
             <Comment>Version bump.</Comment>
             <Name>Idris Kalp</Name>

programming/library/cbindgen/pspec.xml

@@ -14,7 +14,7 @@
         <Description>Rust koduna C bağlamaları oluşturmak için bir araç</Description>
         <Archive sha1sum="4fcf23106eba26de5430e9777d8394daa1860610" type="targz">https://github.com/eqrion/cbindgen/archive/v0.13.2.tar.gz</Archive>
         <BuildDependencies>
-            <Dependency versionFrom="1.41.0">rust</Dependency>
+            <Dependency versionFrom="1.42.0">rust</Dependency>
             <Dependency>llvm</Dependency>
         </BuildDependencies>
     </Source>
@@ -32,7 +32,7 @@
     
     <History>
 		<Update release="10">
-            <Date>2020-03-26</Date>
+            <Date>2020-03-28</Date>
             <Version>0.13.2</Version>
             <Comment>Version bump.</Comment>
             <Name>Idris Kalp</Name>

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*")

x11/library/libclc/files/clang32

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/usr/bin/clang -m32 $@

x11/library/libclc/pspec.xml

@@ -12,12 +12,15 @@
         <IsA>library</IsA>
         <Summary>Library requirements of the OpenCL C programming language</Summary>
         <Description>Library requirements of the OpenCL C programming language</Description>
-        <Archive sha1sum="a9574c191c68d85f419f66a45fc811da63460cea" type="tarxz">https://sourceforge.net/projects/pisilinux/files/source/libclc-r375507.tar.xz</Archive>
+        <Archive sha1sum="7bb5c4b2cd35f163a19fdf326231570e1abb1c90" type="tarxz">https://sourceforge.net/projects/pisilinux/files/source/libclc-10.0.0_20200215.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>llvm</Dependency>
             <Dependency>python-devel</Dependency>
             <Dependency>llvm-clang-devel</Dependency>
         </BuildDependencies>
+       <AdditionalFiles>
+            <AdditionalFile target="clang32">clang32</AdditionalFile>
+        </AdditionalFiles>
     </Source>
 
     <Package>
@@ -31,6 +34,15 @@
         </Files>
     </Package>
 	
+   <Package>
+        <Name>libclc-32bit</Name>
+        <BuildType>emul32</BuildType>
+        <PartOf>emul32</PartOf>
+        <Files>
+            <Path fileType="library">/usr/lib32</Path>
+        </Files>
+    </Package>
+	
     <Package>
         <Name>libclc-devel</Name>
         <Summary>Development files for libclc</Summary>
@@ -40,13 +52,14 @@
         <Files>
             <Path fileType="header">/usr/include</Path>
             <Path fileType="library">/usr/lib/pkgconfig</Path>
+            <Path fileType="library">/usr/lib32/pkgconfig</Path>
         </Files>
     </Package>
     
     <History>
         <Update release="1">
-            <Date>2020-01-05</Date>
+            <Date>2020-03-26</Date>
-            <Version>9.0.1_375507</Version>
+            <Version>10.0.0_20200215</Version>
             <Comment>First release</Comment>
             <Name>İdris Kalp</Name>
             <Email>idriskalp@gmail.com</Email>

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)
 

x11/library/mesa/files/crossfile.ini

@@ -0,0 +1,2 @@
+[binaries]
+llvm-config = '/usr/bin/llvm-config-32'

x11/library/mesa/pspec.xml

@@ -13,7 +13,7 @@
         <IsA>app:console</IsA>
         <Summary>Mesa graphics libraries and utilities</Summary>
         <Description>Mesa is an open-source implementation of the OpenGL specification - a system for rendering interactive 3D graphics.</Description>
-        <Archive sha1sum="c3d603ec4857699fc93054351f24cfbd35818329" type="tarxz">https://mesa.freedesktop.org/archive/mesa-19.3.5.tar.xz</Archive>
+        <Archive sha1sum="c05cd6ab77577b0ce14642ab6cde295fba0256ef" type="tarxz">https://mesa.freedesktop.org/archive/mesa-20.0.2.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>meson</Dependency>
             <Dependency>zlib-devel</Dependency>
@@ -55,6 +55,9 @@
             <Dependency>libclc-devel</Dependency>
             <Dependency>lm_sensors-devel</Dependency>
         </BuildDependencies>
+        <AdditionalFiles>
+            <AdditionalFile owner="root" permission="0644" target="crossfile.ini">crossfile.ini</AdditionalFile>
+        </AdditionalFiles>
         <Patches>
         </Patches>
     </Source>
@@ -164,6 +167,7 @@
             <Dependency>libXrandr-32bit</Dependency>
             <Dependency>libglvnd-32bit</Dependency>
             <Dependency>vulkan-32bit</Dependency>
+            <Dependency>libclc-32bit</Dependency>
         </BuildDependencies>
         <RuntimeDependencies>
             <Dependency>zlib-32bit</Dependency>
@@ -188,7 +192,9 @@
             <Dependency>libdrm-nouveau-32bit</Dependency>
             <Dependency>wayland-32bit</Dependency>
             <Dependency>vulkan-32bit</Dependency>
+            <Dependency>opencl-icd-32bit</Dependency>
             <Dependency>libglvnd-32bit</Dependency>
+            <Dependency>libclc-32bit</Dependency>
             <Dependency>libunwind-32bit</Dependency>
             <Dependency release="current">mesa</Dependency>
             <Dependency versionFrom="8.0.0">llvm-32bit</Dependency>
@@ -200,19 +206,12 @@
     </Package>
 
     <History>
-        <Update release="20">
-            <Date>2020-03-10</Date>
-            <Version>19.3.5</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Mustafa Cinasal</Name>
-            <Email>muscnsl@gmail.com</Email>
-        </Update>
         <Update release="19">
-            <Date>2020-01-11</Date>
+            <Date>2020-03-27</Date>
-            <Version>19.3.2</Version>
+            <Version>20.0.2</Version>
             <Comment>Version bump.</Comment>
-            <Name>Mustafa Cinasal</Name>
+            <Name>İdris Kalp</Name>
-            <Email>muscnsl@gmail.com</Email>
+            <Email>idriskalp@gmail.com</Email>
         </Update>
         <Update release="18">
             <Date>2020-01-03</Date>