[rocm-clang-ocl] Successful build in clean chroot (#264)

Changes

3 changed files (+47/-13)

• rocm-clang-ocl/.SRCINFO
  • @@ -1,14 +1,18 @@
    pkgbase = rocm-clang-ocl pkgdesc = OpenCL compilation with clang compiler. pkgver = 3.5.0 - pkgrel = 1 + pkgrel = 2 url = https://github.com/RadeonOpenCompute/clang-ocl arch = x86_64 license = unknown makedepends = cmake makedepends = rocm-cmake - source = rocm-clang-ocl-3.5.0::https://github.com/RadeonOpenCompute/clang-ocl/archive/rocm-3.5.0.tar.gz + depends = llvm-amdgpu + depends = rocm-opencl-runtime + source = rocm-clang-ocl-3.5.0.tar.gz::https://github.com/RadeonOpenCompute/clang-ocl/archive/rocm-3.5.0.tar.gz + source = remove_hcc_path.patch sha256sums = 38c95fbd0ac3d11d9bd224ad333b68b9620dde502b8a8a9f3d96ba642901e8bb + sha256sums = 54c9264971e1ca4d6999c40f5aa649ff127ddaaaea97a233b85943095f0912a1 pkgname = rocm-clang-ocl
• rocm-clang-ocl/PKGBUILD
  • @@ -2,27 +2,38 @@
    # Contributor: Lucas Magalhães <whoisroot@national.shitposting.agency> pkgname=rocm-clang-ocl pkgver=3.5.0 - pkgrel=1 + pkgrel=2 pkgdesc="OpenCL compilation with clang compiler." arch=('x86_64') url="https://github.com/RadeonOpenCompute/clang-ocl" license=('unknown') + depends=('llvm-amdgpu' 'rocm-opencl-runtime') makedepends=('cmake' 'rocm-cmake') - source=("${pkgname}-${pkgver}::https://github.com/RadeonOpenCompute/clang-ocl/archive/rocm-$pkgver.tar.gz") - sha256sums=('38c95fbd0ac3d11d9bd224ad333b68b9620dde502b8a8a9f3d96ba642901e8bb') + source=("${pkgname}-${pkgver}.tar.gz::$url/archive/rocm-$pkgver.tar.gz" + 'remove_hcc_path.patch') + sha256sums=('38c95fbd0ac3d11d9bd224ad333b68b9620dde502b8a8a9f3d96ba642901e8bb' + '54c9264971e1ca4d6999c40f5aa649ff127ddaaaea97a233b85943095f0912a1') + _dirname="$(basename "$url")-$(basename ${source[0]} .tar.gz)" + + prepare() { + cd "$_dirname" + patch -Np1 -i "$srcdir/remove_hcc_path.patch" + } build() { - mkdir -p "$srcdir/build" - cd "$srcdir/build" + cmake -Wno-dev -B build \ + -S "$_dirname" \ + -DCLANG_BIN=/opt/rocm/llvm/bin \ + -DBITCODE_DIR=/opt/rocm/lib \ + -DCMAKE_INSTALL_PREFIX=/opt/rocm - cmake -DCMAKE_INSTALL_PREFIX=/opt/rocm \ - "$srcdir/clang-ocl-rocm-$pkgver" + make -C build + } - make + check() { + make -C build check } package() { - cd "$srcdir/build" - - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" make -C build install }
• rocm-clang-ocl/remove_hcc_path.patch (new)
  • @@ -0,0 +1,19 @@
    + *** clang-ocl-rocm-3.5.0/CMakeLists.txt.bak 2020-06-20 18:53:09.243264978 +0200 + --- clang-ocl-rocm-3.5.0/CMakeLists.txt 2020-06-20 18:54:01.412910087 +0200 + *************** + *** 15,21 **** + if(CMAKE_CXX_COMPILER MATCHES ".*hcc") + set(HCC_EXE ${CMAKE_CXX_COMPILER}) + else() + ! find_program(HCC_EXE NAMES hcc clang PATHS /opt/rocm/hcc/bin) + endif() + + get_filename_component(HCC_BIN ${HCC_EXE} DIRECTORY) + --- 15,21 ---- + if(CMAKE_CXX_COMPILER MATCHES ".*hcc") + set(HCC_EXE ${CMAKE_CXX_COMPILER}) + else() + ! find_program(HCC_EXE NAMES hcc clang PATHS /opt/rocm/llvm/bin) + endif() + + get_filename_component(HCC_BIN ${HCC_EXE} DIRECTORY)