Changes

3 changed files (+8/-59)

• comgr/.SRCINFO
  • @@ -1,7 +1,7 @@
    pkgbase = comgr pkgdesc = Radeon Open Compute - compiler support - pkgver = 3.3.0 - pkgrel = 4 + pkgver = 3.5.0 + pkgrel = 1 url = https://github.com/RadeonOpenCompute/ROCm-CompilerSupport arch = x86_64 license = custom:NCSAOSL
  • @@ -11,10 +11,8 @@ pkgbase = comgr
    makedepends = llvm-amdgpu depends = z3 depends = zlib - source = https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-3.3.0.tar.gz - source = comgr-find-lld-includes.patch - sha256sums = 01e2524e0f28ecd6f46c9720f279207de935d826b0172158792aa3ec86af9ca7 - sha256sums = 4571b16961f15249e8cc8b9a9ae7f0863600345aa5e95959192149eacdb01d2e + source = comgr-3.5.0.tar.gz::https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-3.5.0.tar.gz + sha256sums = 25c963b46a82d76d55b2302e0e18aac8175362656a465549999ad13d07b689b9 pkgname = comgr
• comgr/PKGBUILD
  • @@ -2,23 +2,17 @@
    pkgname=comgr pkgdesc='Radeon Open Compute - compiler support' - pkgver=3.3.0 - pkgrel=4 + pkgver=3.5.0 + pkgrel=1 arch=('x86_64') url='https://github.com/RadeonOpenCompute/ROCm-CompilerSupport' license=('custom:NCSAOSL') depends=(z3 zlib) makedepends=(cmake rocm-cmake rocm-device-libs llvm-amdgpu) - source=("$url/archive/rocm-$pkgver.tar.gz" - "comgr-find-lld-includes.patch") - sha256sums=('01e2524e0f28ecd6f46c9720f279207de935d826b0172158792aa3ec86af9ca7' - '4571b16961f15249e8cc8b9a9ae7f0863600345aa5e95959192149eacdb01d2e') + source=("${pkgname}-${pkgver}.tar.gz::$url/archive/rocm-$pkgver.tar.gz") + sha256sums=('25c963b46a82d76d55b2302e0e18aac8175362656a465549999ad13d07b689b9') _dirname="$(basename "$url")-$(basename "${source[0]}" .tar.gz)" - prepare() { - patch -uN ${srcdir}/${_dirname}/lib/comgr/CMakeLists.txt comgr-find-lld-includes.patch - } - build() { cmake -DCMAKE_INSTALL_PREFIX=/opt/rocm \ -DCMAKE_PREFIX_PATH="/opt/rocm/llvm;/opt/rocm" \
• comgr/comgr-find-lld-includes.patch (deleted)
  • @@ -1,43 +0,0 @@
    - https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/pull/17 - - From 4588c1a5aad3edae9d3e121685d8d1f5fddd54ba Mon Sep 17 00:00:00 2001 - From: Craig Andrews <candrews@integralblue.com> - Date: Wed, 31 Jul 2019 10:45:01 -0400 - Subject: [PATCH] Find lld includes in LLVM_INCLUDE_DIRS - - Allows building against an LLVM build tree - --- - CMakeLists.txt | 20 ++------------------ - 1 file changed, 2 insertions(+), 18 deletions(-) - - diff --git a/CMakeLists.txt b/CMakeLists.txt - index 454b830..db28533 100644 - --- a/CMakeLists.txt - +++ b/CMakeLists.txt - @@ -19,24 +19,8 @@ include_directories(${LLVM_INCLUDE_DIRS}) - link_directories(${LLVM_LIBRARY_DIRS}) - include_directories(${CLANG_INCLUDE_DIRS}) - - -# FIXME: There is no way to directly determine the include paths for LLD when - -# working with an LLVM build tree, but we want to avoid having to install LLVM - -# to build Comgr. This should eventually be fixed in usptream LLD so this can - -# be removed. - -if(DEFINED LLVM_BUILD_MAIN_SRC_DIR) - - set(INTERNAL_LLD_INCLUDE_DIRS "${LLVM_BUILD_MAIN_SRC_DIR}/tools/lld/include") - - set(EXTERNAL_LLD_INCLUDE_DIRS "${LLVM_BUILD_MAIN_SRC_DIR}/../lld/include") - - if (EXISTS "${INTERNAL_LLD_INCLUDE_DIRS}" - - AND IS_DIRECTORY "${INTERNAL_LLD_INCLUDE_DIRS}") - - set(LLD_INCLUDE_DIRS "${INTERNAL_LLD_INCLUDE_DIRS}") - - elseif (EXISTS "${EXTERNAL_LLD_INCLUDE_DIRS}" - - AND IS_DIRECTORY "${EXTERNAL_LLD_INCLUDE_DIRS}") - - set(LLD_INCLUDE_DIRS "${EXTERNAL_LLD_INCLUDE_DIRS}") - - else() - - message(FATAL_ERROR "You are attempting to compile using an LLVM build tree, but the LLD include directory could not be located. The paths '${INTERNAL_LLD_INCLUDE_DIRS}' and '${EXTERNAL_LLD_INCLUDE_DIRS}' were tried.") - - endif() - - include_directories(${LLD_INCLUDE_DIRS}) - -endif() - +set(LLD_INCLUDE_DIRS "${LLVM_INCLUDE_DIRS}/lld") - +include_directories(${LLD_INCLUDE_DIRS}) - - find_package(AMDDeviceLibs CONFIG) -