From: "Benda XU" <heroxbd@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/rocclr/
Date: Thu, 15 Jul 2021 16:17:43 +0000 (UTC) [thread overview]
Message-ID: <1626365832.d0a3a3f9e5979b8837c85d94c09ccd8135f60d62.heroxbd@gentoo> (raw)
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
}
next reply other threads:[~2021-07-15 16:17 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-15 16:17 Benda XU [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-08-19 19:46 [gentoo-commits] repo/gentoo:master commit in: dev-libs/rocclr/ Craig Andrews
2021-06-28 20:05 Craig Andrews
2021-03-28 21:20 Craig Andrews
2021-01-20 5:36 Benda XU
2020-12-21 12:55 Craig Andrews
2020-12-06 19:04 Craig Andrews
2020-11-14 21:02 Craig Andrews
2020-09-20 20:55 Craig Andrews
2020-09-20 20:54 Craig Andrews
2020-08-23 14:47 Craig Andrews
2020-08-22 17:28 Craig Andrews
2020-08-22 17:28 Craig Andrews
2020-07-10 12:52 Craig Andrews
2020-06-10 0:23 Craig Andrews
2020-06-10 0:23 Craig Andrews
2020-06-09 14:40 Craig Andrews
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1626365832.d0a3a3f9e5979b8837c85d94c09ccd8135f60d62.heroxbd@gentoo \
--to=heroxbd@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox