[arch-commits] Commit in pocl/trunk (PKGBUILD)

2020-12-16 Thread Sven-Hendrik Haase via arch-commits
Date: Wednesday, December 16, 2020 @ 13:35:37
  Author: svenstaro
Revision: 776692

upgpkg: pocl 1.6-1

Modified:
  pocl/trunk/PKGBUILD

--+
 PKGBUILD |   13 +++--
 1 file changed, 3 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-12-16 13:34:59 UTC (rev 776691)
+++ PKGBUILD2020-12-16 13:35:37 UTC (rev 776692)
@@ -4,8 +4,8 @@
 # Contributor: fabien Cellier 
 
 pkgname=pocl
-pkgver=1.5
-pkgrel=5
+pkgver=1.6
+pkgrel=1
 pkgdesc="Portable OpenCL is an open-source implementation of OpenCL which can 
be easily adapted for new targets"
 arch=('x86_64')
 url="http://portablecl.org/;
@@ -14,16 +14,9 @@
 llvm11.patch)
 depends=('clang' 'hwloc' 'opencl-icd-loader')
 makedepends=('llvm' 'cmake' 'opencl-headers' 'ocl-icd' 'ninja')
-sha512sums=('a9c2879b6f0c0d9a78035ba8ed7531b8fa795074864ee5bab265d7dafedac9637025f994719f00f8d9e25bf5068bd9b074d95b964e5d2c0eddb8d8837e6e5da3'
+sha512sums=('ecd3a3867a62a2a555183741fa4586eeefae00514d66d15a79b9094ff0a0248b213f62ab23b3e61bdb1042e760cd34b07e546f97b304ac86c3f861a9161df1b1'
 
'ef149678347c88ee3c1bfef62c0b35667b2f613cc08a90f237b6f9d1a5f3d616fe5d6513bbda36ead5969fc6d32cace7d02a3c4c6230ab5144db94a0af56db30')
 
-prepare() {
-  cd "$pkgname-$pkgver"
-
-  # Cherry-picked upstream commits with "LLVM ?11" in the commit message
-  patch -Np1 -i ../llvm11.patch
-}
-
 build() {
   cd "$pkgname-$pkgver"
   cmake \


[arch-commits] Commit in pocl/trunk (PKGBUILD llvm11.patch)

2020-10-24 Thread Evangelos Foutras via arch-commits
Date: Saturday, October 24, 2020 @ 10:51:47
  Author: foutrelis
Revision: 731196

upgpkg: pocl 1.5-5: LLVM 11 rebuild

Added:
  pocl/trunk/llvm11.patch
Modified:
  pocl/trunk/PKGBUILD

--+
 PKGBUILD |   15 -
 llvm11.patch |  696 +
 2 files changed, 708 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-10-24 10:50:24 UTC (rev 731195)
+++ PKGBUILD2020-10-24 10:51:47 UTC (rev 731196)
@@ -5,16 +5,25 @@
 
 pkgname=pocl
 pkgver=1.5
-pkgrel=4
+pkgrel=5
 pkgdesc="Portable OpenCL is an open-source implementation of OpenCL which can 
be easily adapted for new targets"
 arch=('x86_64')
 url="http://portablecl.org/;
 license=('GPL')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz;)
+source=("$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz;
+llvm11.patch)
 depends=('clang' 'hwloc' 'opencl-icd-loader')
 makedepends=('llvm' 'cmake' 'opencl-headers' 'ocl-icd' 'ninja')
-sha512sums=('a9c2879b6f0c0d9a78035ba8ed7531b8fa795074864ee5bab265d7dafedac9637025f994719f00f8d9e25bf5068bd9b074d95b964e5d2c0eddb8d8837e6e5da3')
+sha512sums=('a9c2879b6f0c0d9a78035ba8ed7531b8fa795074864ee5bab265d7dafedac9637025f994719f00f8d9e25bf5068bd9b074d95b964e5d2c0eddb8d8837e6e5da3'
+
'ef149678347c88ee3c1bfef62c0b35667b2f613cc08a90f237b6f9d1a5f3d616fe5d6513bbda36ead5969fc6d32cace7d02a3c4c6230ab5144db94a0af56db30')
 
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  # Cherry-picked upstream commits with "LLVM ?11" in the commit message
+  patch -Np1 -i ../llvm11.patch
+}
+
 build() {
   cd "$pkgname-$pkgver"
   cmake \

Added: llvm11.patch
===
--- llvm11.patch(rev 0)
+++ llvm11.patch2020-10-24 10:51:47 UTC (rev 731196)
@@ -0,0 +1,696 @@
+From 749a80b2c832771ef3eb6d9af39807dbad97d218 Mon Sep 17 00:00:00 2001
+From: KOLANICH 
+Date: Mon, 3 Feb 2020 11:55:10 +0300
+Subject: [PATCH 1/6] LLVM11 support
+
+(cherry picked from commit 1e31e34cd1f6f9f045ca72a8a26caa8e34a43c4f)
+---
+ cmake/LLVM.cmake|  6 +-
+ config.h.in.cmake   |  4 
+ include/CMakeLists.txt  |  2 +-
+ include/_kernel.h   | 24 ++--
+ include/_libclang_versions_checks.h | 24 
+ include/pocl.h  | 22 ++
+ lib/CL/pocl_llvm_wg.cc  |  4 ++--
+ lib/kernel/CMakeLists.txt   |  1 +
+ 8 files changed, 45 insertions(+), 42 deletions(-)
+ create mode 100644 include/_libclang_versions_checks.h
+
+diff --git a/cmake/LLVM.cmake b/cmake/LLVM.cmake
+index 33c45750..b41e75a9 100644
+--- a/cmake/LLVM.cmake
 b/cmake/LLVM.cmake
+@@ -37,6 +37,7 @@ else()
+   # search for any version
+   find_program(LLVM_CONFIG
+ NAMES
++  "llvm-config-mp-11.0" "llvm-config-11" "llvm-config110"
+   "llvm-config-mp-10.0" "llvm-config-10" "llvm-config100"
+   "llvm-config-mp-9.0" "llvm-config-9" "llvm-config90"
+   "llvm-config-mp-8.0" "llvm-config-8" "llvm-config80"
+@@ -180,8 +181,11 @@ elseif(LLVM_VERSION MATCHES "^9[.]")
+ elseif(LLVM_VERSION MATCHES "^10[.]")
+   set(LLVM_MAJOR 10)
+   set(LLVM_10_0 1)
++elseif(LLVM_VERSION MATCHES "^11[.]")
++  set(LLVM_MAJOR 11)
++  set(LLVM_11_0 1)
+ else()
+-  message(FATAL_ERROR "LLVM version between 6.0 and 10.0 required, found: 
${LLVM_VERSION}")
++  message(FATAL_ERROR "LLVM version between 6.0 and 11.0 required, found: 
${LLVM_VERSION}")
+ endif()
+ 
+ #
+diff --git a/config.h.in.cmake b/config.h.in.cmake
+index 42c63f77..7c6c0eb4 100644
+--- a/config.h.in.cmake
 b/config.h.in.cmake
+@@ -152,6 +152,10 @@
+ 
+ #cmakedefine LLVM_10_0
+ 
++#cmakedefine LLVM_11_0
++
++#cmakedefine LLVM_MAJOR @LLVM_VERSION_MAJOR@
++
+ #cmakedefine LLVM_BUILD_MODE_DEBUG
+ 
+ #ifndef LLVM_VERSION
+diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
+index 321df9d5..31883269 100644
+--- a/include/CMakeLists.txt
 b/include/CMakeLists.txt
+@@ -27,7 +27,7 @@ add_subdirectory("CL")
+ 
+ set(PRIVATE_HEADERS _enable_all_exts.h _builtin_renames.h
+ _kernel.h _clang_opencl.h
+-_kernel_c.h _kernel_constants.h
++_kernel_c.h _kernel_constants.h 
_libclang_versions_checks.h
+ pocl_types.h pocl_device.h pocl.h pocl_spir.h
+ pocl_image_types.h)
+ 
+diff --git a/include/_kernel.h b/include/_kernel.h
+index 427794e3..90154648 100644
+--- a/include/_kernel.h
 b/include/_kernel.h
+@@ -143,32 +143,20 @@
+ # undef LLVM_10_0
+ # define LLVM_10_0
+ 
++#elif (__clang_major__ == 11)
++
++# undef LLVM_11_0
++# define LLVM_11_0
+ #else
+ 
+ #error Unsupported Clang/LLVM version.
+ 
+ #endif
+ 

[arch-commits] Commit in pocl/trunk (PKGBUILD)

2020-10-17 Thread Sven-Hendrik Haase via arch-commits
Date: Sunday, October 18, 2020 @ 00:44:14
  Author: svenstaro
Revision: 725851

upgpkg: pocl 1.5-4: Include all CPU variants (FS#68282)

Modified:
  pocl/trunk/PKGBUILD

--+
 PKGBUILD |   28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-10-18 00:44:12 UTC (rev 725850)
+++ PKGBUILD2020-10-18 00:44:14 UTC (rev 725851)
@@ -5,7 +5,7 @@
 
 pkgname=pocl
 pkgver=1.5
-pkgrel=2
+pkgrel=4
 pkgdesc="Portable OpenCL is an open-source implementation of OpenCL which can 
be easily adapted for new targets"
 arch=('x86_64')
 url="http://portablecl.org/;
@@ -12,27 +12,27 @@
 license=('GPL')
 
source=("$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz;)
 depends=('clang' 'hwloc' 'opencl-icd-loader')
-makedepends=('llvm' 'cmake' 'opencl-headers' 'ocl-icd')
+makedepends=('llvm' 'cmake' 'opencl-headers' 'ocl-icd' 'ninja')
 
sha512sums=('a9c2879b6f0c0d9a78035ba8ed7531b8fa795074864ee5bab265d7dafedac9637025f994719f00f8d9e25bf5068bd9b074d95b964e5d2c0eddb8d8837e6e5da3')
 
 build() {
-  mkdir -p build
-  cd build
-
+  cd "$pkgname-$pkgver"
   cmake \
--DCMAKE_INSTALL_PREFIX=/usr \
--DCMAKE_INSTALL_LIBDIR=lib \
--DCMAKE_BUILD_TYPE=Release \
-"$srcdir/$pkgname-$pkgver"
-  make
+  -GNinja \
+  -Bbuild \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  -DCMAKE_INSTALL_LIBDIR=lib \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DKERNELLIB_HOST_CPU_VARIANTS=distro
+  ninja -C build
 }
 
 check() {
-  cd build
-  make check
+  cd "$pkgname-$pkgver"
+  ninja -C build check
 }
 
 package() {
-  cd build
-  make DESTDIR="$pkgdir"/ install
+  cd "$pkgname-$pkgver"
+  DESTDIR="$pkgdir"/ ninja -C build install
 }


[arch-commits] Commit in pocl/trunk (PKGBUILD)

2020-04-15 Thread Evangelos Foutras via arch-commits
Date: Wednesday, April 15, 2020 @ 22:59:21
  Author: foutrelis
Revision: 615077

upgpkg: pocl 1.5-2: LLVM 10 rebuild

Modified:
  pocl/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-15 22:53:04 UTC (rev 615076)
+++ PKGBUILD2020-04-15 22:59:21 UTC (rev 615077)
@@ -5,7 +5,7 @@
 
 pkgname=pocl
 pkgver=1.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Portable OpenCL is an open-source implementation of OpenCL which can 
be easily adapted for new targets"
 arch=('x86_64')
 url="http://portablecl.org/;


[arch-commits] Commit in pocl/trunk (PKGBUILD)

2020-04-04 Thread Sven-Hendrik Haase via arch-commits
Date: Sunday, April 5, 2020 @ 02:10:01
  Author: svenstaro
Revision: 611768

upgpkg: pocl 1.5-1

Modified:
  pocl/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-05 00:25:18 UTC (rev 611767)
+++ PKGBUILD2020-04-05 02:10:01 UTC (rev 611768)
@@ -4,8 +4,8 @@
 # Contributor: fabien Cellier 
 
 pkgname=pocl
-pkgver=1.4
-pkgrel=3
+pkgver=1.5
+pkgrel=1
 pkgdesc="Portable OpenCL is an open-source implementation of OpenCL which can 
be easily adapted for new targets"
 arch=('x86_64')
 url="http://portablecl.org/;
@@ -13,7 +13,7 @@
 
source=("$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz;)
 depends=('clang' 'hwloc' 'opencl-icd-loader')
 makedepends=('llvm' 'cmake' 'opencl-headers' 'ocl-icd')
-sha512sums=('ef4911638c76d988c120b69a991e54773a6b8bde49433c2e0f1703c374fa65a4fa64ebcaec94569863458032c17d8cb9879dc501b7e3a43b2c24524bce1b6098')
+sha512sums=('a9c2879b6f0c0d9a78035ba8ed7531b8fa795074864ee5bab265d7dafedac9637025f994719f00f8d9e25bf5068bd9b074d95b964e5d2c0eddb8d8837e6e5da3')
 
 build() {
   mkdir -p build


[arch-commits] Commit in pocl/trunk (PKGBUILD)

2020-03-26 Thread Sven-Hendrik Haase via arch-commits
Date: Thursday, March 26, 2020 @ 12:18:28
  Author: svenstaro
Revision: 604432

upgpkg: pocl 1.4-3: Shuffle some deps around

Modified:
  pocl/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-03-26 11:50:10 UTC (rev 604431)
+++ PKGBUILD2020-03-26 12:18:28 UTC (rev 604432)
@@ -5,14 +5,14 @@
 
 pkgname=pocl
 pkgver=1.4
-pkgrel=2
+pkgrel=3
 pkgdesc="Portable OpenCL is an open-source implementation of OpenCL which can 
be easily adapted for new targets"
 arch=('x86_64')
 url="http://portablecl.org/;
 license=('GPL')
-depends=('clang' 'hwloc' 'libltdl' 'opencl-headers' 'opencl-icd-loader')
-source=("https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz;)
-makedepends=('cmake' 'llvm' 'ocl-icd')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz;)
+depends=('clang' 'hwloc' 'opencl-icd-loader')
+makedepends=('llvm' 'cmake' 'opencl-headers' 'ocl-icd')
 
sha512sums=('ef4911638c76d988c120b69a991e54773a6b8bde49433c2e0f1703c374fa65a4fa64ebcaec94569863458032c17d8cb9879dc501b7e3a43b2c24524bce1b6098')
 
 build() {