diff options
-rw-r--r-- | .SRCINFO | 18 | ||||
-rw-r--r-- | PKGBUILD | 48 | ||||
-rw-r--r-- | install_vendor_file.patch | 20 |
3 files changed, 21 insertions, 65 deletions
@@ -1,28 +1,20 @@ pkgbase = rocm-opencl-runtime pkgdesc = Radeon Open Compute - OpenCL runtime - pkgver = 3.3.0 - pkgrel = 7 + pkgver = 3.5.0 + pkgrel = 1 url = https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime arch = x86_64 license = MIT - makedepends = mesa makedepends = cmake - makedepends = git makedepends = rocm-cmake depends = hsakmt-roct depends = hsa-rocr + depends = rocclr depends = opencl-icd-loader - depends = comgr provides = rocm-opencl-runtime provides = opencl-driver - source = https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-3.3.0.tar.gz - source = https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/978b4b3a29a3aebc86ce9315d5c5963e88722d03.tar.gz - source = ret_val-fix.patch::https://github.com/KhronosGroup/OpenCL-ICD-Loader/commit/9acc3fcbeadeef27c57d9fb195c4a94fbcf52f66.patch - source = install_vendor_file.patch - sha256sums = ac6999f1a491ab066286c2bd6adf50f08f831286f56e267879f9f7eced22f98e - sha256sums = 0c14bf890bd198ef5a814b5b7ed57b69e890b0c0a1bcfba8fdad996fa1a97fc7 - sha256sums = 59bbb5e566c32a55deedb849eb6224c3b196df6fb3a3b1aa7f5b7adb86cd6614 - sha256sums = b83de5ea8ae889664ce2725f90c5db8c1c9e98839d75c7743b355d16435dccee + source = rocm-opencl-runtime-3.5.0.tar.gz::https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-3.5.0.tar.gz + sha256sums = 511b617d5192f2d4893603c1a02402b2ac9556e9806ff09dd2a91d398abf39a0 pkgname = rocm-opencl-runtime @@ -1,54 +1,38 @@ # Maintainer: Ranieri Althoff <ranisalt+aur at gmail dot com> -_opencl_icd_loader_repo='https://github.com/KhronosGroup/OpenCL-ICD-Loader' -_opencl_icd_loader_commit='978b4b3a29a3aebc86ce9315d5c5963e88722d03' - pkgname=rocm-opencl-runtime -pkgver=3.3.0 -pkgrel=7 +pkgver=3.5.0 +pkgrel=1 pkgdesc='Radeon Open Compute - OpenCL runtime' arch=('x86_64') url='https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime' license=('MIT') -depends=('hsakmt-roct' 'hsa-rocr' 'opencl-icd-loader' 'comgr') -makedepends=('mesa' 'cmake' 'git' 'rocm-cmake') +depends=('hsakmt-roct' 'hsa-rocr' 'rocclr' 'opencl-icd-loader') +makedepends=('cmake' 'rocm-cmake') provides=("$pkgname" 'opencl-driver') -source=("$url/archive/roc-$pkgver.tar.gz" - "$_opencl_icd_loader_repo/archive/$_opencl_icd_loader_commit.tar.gz" - "ret_val-fix.patch::$_opencl_icd_loader_repo/commit/9acc3fcbeadeef27c57d9fb195c4a94fbcf52f66.patch" - 'install_vendor_file.patch') -sha256sums=('ac6999f1a491ab066286c2bd6adf50f08f831286f56e267879f9f7eced22f98e' - '0c14bf890bd198ef5a814b5b7ed57b69e890b0c0a1bcfba8fdad996fa1a97fc7' - '59bbb5e566c32a55deedb849eb6224c3b196df6fb3a3b1aa7f5b7adb86cd6614' - 'b83de5ea8ae889664ce2725f90c5db8c1c9e98839d75c7743b355d16435dccee') +source=("$pkgname-$pkgver.tar.gz::$url/archive/roc-$pkgver.tar.gz") +sha256sums=('511b617d5192f2d4893603c1a02402b2ac9556e9806ff09dd2a91d398abf39a0') _dirname="$(basename "$url")-$(basename "${source[0]}" .tar.gz)" -_opencl_dirname="$(basename "$_opencl_icd_loader_repo")-$(basename "${source[1]}" .tar.gz)" - -prepare() { - cd "$_dirname" - patch -Np1 -i "$srcdir/install_vendor_file.patch" - - mkdir -p api/opencl/khronos - mv "$srcdir/$_opencl_dirname" api/opencl/khronos/icd - - cd api/opencl/khronos/icd - patch -Np1 -i "$srcdir/ret_val-fix.patch" -} build() { + CFLAGS="$CFLAGS -isystem /opt/rocm/rocclr/include/include -isystem /opt/rocm/rocclr/include/compiler/lib -isystem /opt/rocm/rocclr/include/compiler/lib/include" \ + CXXFLAGS="$CXXFLAGS -isystem /opt/rocm/rocclr/include/include -isystem /opt/rocm/rocclr/include/compiler/lib -isystem /opt/rocm/rocclr/include/compiler/lib/include" \ cmake -DCMAKE_INSTALL_PREFIX=/opt/rocm \ - -DCMAKE_INSTALL_SYSCONFDIR=/etc \ - -DCMAKE_MODULE_PATH=/opt/rocm/share/rocm/cmake \ - -DCMAKE_PREFIX_PATH=/opt/rocm/lib/cmake \ + -DROCclr_DIR=/opt/rocm/rocclr \ + -DLIBROCclr_STATIC_DIR=/opt/rocm/rocclr/lib \ -DUSE_COMGR_LIBRARY=yes \ + -DBUILD_TESTING=OFF \ "$_dirname" make } package() { DESTDIR="$pkgdir" make install - install -Dm644 "$_dirname/License" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 "$_dirname/LICENSE.txt" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" install -Dm644 /dev/stdin "$pkgdir/etc/ld.so.conf.d/$pkgname.conf" <<-EOF - /opt/rocm/lib/x86_64 + /opt/rocm/lib +EOF + install -Dm644 /dev/stdin "$pkgdir/etc/OpenCL/vendors/amdocl64.icd" <<EOF +/opt/rocm/lib/libamdocl64.so EOF } diff --git a/install_vendor_file.patch b/install_vendor_file.patch deleted file mode 100644 index 1a67f0f7d7ba..000000000000 --- a/install_vendor_file.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 7c6726d975d54185d1318a112059f3e9ca5edf36 Mon Sep 17 00:00:00 2001 -From: Ranieri Althoff <1993083+ranisalt@users.noreply.github.com> -Date: Sat, 18 Apr 2020 18:02:58 +0000 -Subject: [PATCH] Install amdocl64.icd where ICD loader expects it - ---- - api/opencl/amdocl/CMakeLists.txt | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/api/opencl/amdocl/CMakeLists.txt b/api/opencl/amdocl/CMakeLists.txt -index e217110..2731a6a 100644 ---- rocm-opencl-runtime/api/opencl/amdocl/CMakeLists.txt -+++ rocm-opencl-runtime/api/opencl/amdocl/CMakeLists.txt -@@ -83,3 +83,6 @@ if(${USE_COMGR_LIBRARY} MATCHES "yes") - else() - target_link_libraries(amdocl64 opencl_driver oclelf pthread dl ${ROCT_LIBRARIES} ${ROCR_LIBRARIES}) - endif() -+ -+file(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/amdocl64.icd" CONTENT "$<TARGET_FILE_NAME:amdocl64>") -+install(FILES "${CMAKE_BINARY_DIR}/amdocl64.icd" DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}/OpenCL/vendors/") |