commit:     14d25dadca383910e28865144a2316fe302dbf96
Author:     YiyangWu <xgreenlandforwyy <AT> gmail <DOT> com>
AuthorDate: Thu Mar 24 13:00:38 2022 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 03:12:52 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14d25dad

dev-util/Tensile: fix hardcoded EPREFIX in gentoopath.patch

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Yiyang Wu <xgreenlandforwyy <AT> gmail.com>
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 dev-util/Tensile/Tensile-4.3.0-r1.ebuild              | 4 ++--
 dev-util/Tensile/files/Tensile-4.3.0-gentoopath.patch | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-util/Tensile/Tensile-4.3.0-r1.ebuild 
b/dev-util/Tensile/Tensile-4.3.0-r1.ebuild
index 143867819d04..91bbbda89785 100644
--- a/dev-util/Tensile/Tensile-4.3.0-r1.ebuild
+++ b/dev-util/Tensile/Tensile-4.3.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+inherit distutils-r1 prefix
 
 DESCRIPTION="Stretching GPU performance for GEMMs and tensor contractions"
 HOMEPAGE="https://github.com/ROCmSoftwarePlatform/Tensile";
@@ -33,11 +33,11 @@ PATCHES=( "${FILESDIR}"/${PN}-4.3.0-output-commands.patch
                  "${FILESDIR}"/${PN}-4.3.0-gfx1031.patch
                  "${FILESDIR}"/${PN}-4.3.0-fix-arch-parse.patch
                  "${FILESDIR}"/${PN}-4.3.0-use-ninja.patch
-                 "${FILESDIR}"/${PN}-4.3.0-gentoopath.patch
          )
 
 src_prepare() {
        distutils-r1_src_prepare
+       eapply $(prefixify_ro "${FILESDIR}"/${PN}-4.3.0-gentoopath.patch)
 
        pushd ${PN} || die
 

diff --git a/dev-util/Tensile/files/Tensile-4.3.0-gentoopath.patch 
b/dev-util/Tensile/files/Tensile-4.3.0-gentoopath.patch
index 6fda0ddc6a8d..da135e3b38ee 100644
--- a/dev-util/Tensile/files/Tensile-4.3.0-gentoopath.patch
+++ b/dev-util/Tensile/files/Tensile-4.3.0-gentoopath.patch
@@ -17,7 +17,7 @@ Index: Tensile-rocm-4.3.0/Tensile/Source/lib/CMakeLists.txt
  
  if(TENSILE_USE_LLVM)
 -    find_package(LLVM 13.0 QUIET CONFIG)
-+    find_package(LLVM PATHS /opt/gentoo/usr/lib/llvm/roc QUIET CONFIG)
++    find_package(LLVM PATHS @GENTOO_PORTAGE_EPREFIX@/usr/lib/llvm/roc QUIET 
CONFIG)
      if(NOT LLVM_FOUND)
          find_package(LLVM 12.0 QUIET CONFIG)
          if(NOT LLVM_FOUND)
@@ -30,7 +30,7 @@ Index: Tensile-rocm-4.3.0/Tensile/Common.py
        print2(" %24s: %8s (unspecified)" % (key, defaultValue))
  
 -  globalParameters["ROCmPath"] = "/opt/rocm"
-+  globalParameters["ROCmPath"] = "/opt/gentoo/usr"
++  globalParameters["ROCmPath"] = "@GENTOO_PORTAGE_EPREFIX@/usr"
    if "ROCM_PATH" in os.environ:
      globalParameters["ROCmPath"] = os.environ.get("ROCM_PATH")
    if "TENSILE_ROCM_PATH" in os.environ:

Reply via email to