commit:     d0a3a3f9e5979b8837c85d94c09ccd8135f60d62
Author:     YiyangWu <xgreenlandforwyy <AT> gmail <DOT> com>
AuthorDate: Thu Jul 15 15:05:12 2021 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu Jul 15 16:17:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0a3a3f9

dev-libs/rocclr: prefixify src_install.

rocclr-4.1 and 4.2 fails to merge in src_install because files are
installed outside gentoo prefix. This commit fixes this bug.

Closes: https://github.com/gentoo/gentoo/pull/21654

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

 dev-libs/rocclr/rocclr-4.1.0.ebuild | 4 ++--
 dev-libs/rocclr/rocclr-4.2.0.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-libs/rocclr/rocclr-4.1.0.ebuild 
b/dev-libs/rocclr/rocclr-4.1.0.ebuild
index 46dfd99646d..14d12c5c2f5 100644
--- a/dev-libs/rocclr/rocclr-4.1.0.ebuild
+++ b/dev-libs/rocclr/rocclr-4.1.0.ebuild
@@ -31,7 +31,7 @@ src_configure() {
        local mycmakeargs=(
                -DUSE_COMGR_LIBRARY=YES
                -DOPENCL_DIR="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
-               -DCMAKE_INSTALL_PREFIX="/usr"
+               -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
        )
        cmake_src_configure
 }
@@ -40,5 +40,5 @@ src_install() {
        cmake_src_install
 
        # This should be fixed in the CMakeLists.txt
-       sed -e "s:${BUILD_DIR}:${EPREFIX}/usr:" -i 
"${D}/usr/lib/cmake/rocclr/ROCclrConfig.cmake" || die
+       sed -e "s:${BUILD_DIR}:${EPREFIX}/usr:" -i 
"${ED}/usr/lib/cmake/rocclr/ROCclrConfig.cmake" || die
 }

diff --git a/dev-libs/rocclr/rocclr-4.2.0.ebuild 
b/dev-libs/rocclr/rocclr-4.2.0.ebuild
index 46dfd99646d..14d12c5c2f5 100644
--- a/dev-libs/rocclr/rocclr-4.2.0.ebuild
+++ b/dev-libs/rocclr/rocclr-4.2.0.ebuild
@@ -31,7 +31,7 @@ src_configure() {
        local mycmakeargs=(
                -DUSE_COMGR_LIBRARY=YES
                -DOPENCL_DIR="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
-               -DCMAKE_INSTALL_PREFIX="/usr"
+               -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
        )
        cmake_src_configure
 }
@@ -40,5 +40,5 @@ src_install() {
        cmake_src_install
 
        # This should be fixed in the CMakeLists.txt
-       sed -e "s:${BUILD_DIR}:${EPREFIX}/usr:" -i 
"${D}/usr/lib/cmake/rocclr/ROCclrConfig.cmake" || die
+       sed -e "s:${BUILD_DIR}:${EPREFIX}/usr:" -i 
"${ED}/usr/lib/cmake/rocclr/ROCclrConfig.cmake" || die
 }

Reply via email to