From: "Craig Andrews" <candrews@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/rocr-runtime/
Date: Sun, 11 Jul 2021 03:26:00 +0000 (UTC) [thread overview]
Message-ID: <1625973934.528d59f18a7a1b17acedb4628e22de3fb29c0b5b.candrews@gentoo> (raw)
commit: 528d59f18a7a1b17acedb4628e22de3fb29c0b5b
Author: YiyangWu <xgreenlandforwyy <AT> gmail <DOT> com>
AuthorDate: Sun Jul 11 03:04:44 2021 +0000
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Sun Jul 11 03:25:34 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=528d59f1
dev-libs/rocr-runtime: fix for gentoo prefix
The current ebuild cannot find bitcode during cmake configuration in
gentoo prefix. This commit provide a fix.
version >= 4 are modified, while 3.x are older versions which remain
original states.
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Yiyang Wu <xgreenlandforwyy <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/21590
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
dev-libs/rocr-runtime/rocr-runtime-4.0.0.ebuild | 4 ++--
dev-libs/rocr-runtime/rocr-runtime-4.1.0.ebuild | 4 ++--
dev-libs/rocr-runtime/rocr-runtime-4.2.0.ebuild | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dev-libs/rocr-runtime/rocr-runtime-4.0.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-4.0.0.ebuild
index 256f7ffb9e4..6326a7e4b20 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-4.0.0.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-4.0.0.ebuild
@@ -38,10 +38,10 @@ src_prepare() {
sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
# ... otherwise system llvm/clang is used ...
- sed -e "s:find_package(Clang REQUIRED HINTS \${CMAKE_INSTALL_PREFIX}/llvm \${CMAKE_PREFIX_PATH}/llvm PATHS /opt/rocm/llvm ):find_package(Clang REQUIRED HINTS /usr/lib/llvm/roc ):" -i image/blit_src/CMakeLists.txt || die
+ sed -e "s:find_package(Clang REQUIRED HINTS \${CMAKE_INSTALL_PREFIX}/llvm \${CMAKE_PREFIX_PATH}/llvm PATHS /opt/rocm/llvm ):find_package(Clang REQUIRED HINTS ${EPREFIX}/usr/lib/llvm/roc ):" -i image/blit_src/CMakeLists.txt || die
# Gentoo installs "*.bc" to "/usr/lib" instead of a "[path]/bitcode" directory ...
- sed -e "s:/opt/rocm/amdgcn/bitcode:/usr/lib/amdgcn/bitcode:" -i image/blit_src/CMakeLists.txt || die
+ sed -e "s:/opt/rocm/amdgcn/bitcode:${EPREFIX}/usr/lib/amdgcn/bitcode:" -i image/blit_src/CMakeLists.txt || die
cmake_src_prepare
}
diff --git a/dev-libs/rocr-runtime/rocr-runtime-4.1.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-4.1.0.ebuild
index 38fc7decb01..e91c230b519 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-4.1.0.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-4.1.0.ebuild
@@ -39,10 +39,10 @@ src_prepare() {
sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
# ... otherwise system llvm/clang is used ...
- sed -e "s:find_package(Clang REQUIRED HINTS \${CMAKE_INSTALL_PREFIX}/llvm \${CMAKE_PREFIX_PATH}/llvm PATHS /opt/rocm/llvm ):find_package(Clang REQUIRED HINTS /usr/lib/llvm/roc ):" -i image/blit_src/CMakeLists.txt || die
+ sed -e "s:find_package(Clang REQUIRED HINTS \${CMAKE_INSTALL_PREFIX}/llvm \${CMAKE_PREFIX_PATH}/llvm PATHS /opt/rocm/llvm ):find_package(Clang REQUIRED HINTS ${EPREFIX}/usr/lib/llvm/roc ):" -i image/blit_src/CMakeLists.txt || die
# Gentoo installs "*.bc" to "/usr/lib" instead of a "[path]/bitcode" directory ...
- sed -e "s:/opt/rocm/amdgcn/bitcode:/usr/lib/amdgcn/bitcode:" -i image/blit_src/CMakeLists.txt || die
+ sed -e "s:/opt/rocm/amdgcn/bitcode:${EPREFIX}/usr/lib/amdgcn/bitcode:" -i image/blit_src/CMakeLists.txt || die
cmake_src_prepare
}
diff --git a/dev-libs/rocr-runtime/rocr-runtime-4.2.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-4.2.0.ebuild
index 75444f1b60d..c9bc5602a20 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-4.2.0.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-4.2.0.ebuild
@@ -37,10 +37,10 @@ src_prepare() {
sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
# ... otherwise system llvm/clang is used ...
- sed -e "s:find_package(Clang REQUIRED HINTS \${CMAKE_INSTALL_PREFIX}/llvm \${CMAKE_PREFIX_PATH}/llvm PATHS /opt/rocm/llvm ):find_package(Clang REQUIRED HINTS /usr/lib/llvm/roc ):" -i image/blit_src/CMakeLists.txt || die
+ sed -e "s:find_package(Clang REQUIRED HINTS \${CMAKE_INSTALL_PREFIX}/llvm \${CMAKE_PREFIX_PATH}/llvm PATHS /opt/rocm/llvm ):find_package(Clang REQUIRED HINTS ${EPREFIX}/usr/lib/llvm/roc ):" -i image/blit_src/CMakeLists.txt || die
# Gentoo installs "*.bc" to "/usr/lib" instead of a "[path]/bitcode" directory ...
- sed -e "s:/opt/rocm/amdgcn/bitcode:/usr/lib/amdgcn/bitcode:" -i image/blit_src/CMakeLists.txt || die
+ sed -e "s:/opt/rocm/amdgcn/bitcode:${EPREFIX}/usr/lib/amdgcn/bitcode:" -i image/blit_src/CMakeLists.txt || die
cmake_src_prepare
}
next reply other threads:[~2021-07-11 3:26 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-11 3:26 Craig Andrews [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-10-12 13:08 [gentoo-commits] repo/gentoo:master commit in: dev-libs/rocr-runtime/ Andreas Sturmlechner
2025-10-11 18:14 Andreas Sturmlechner
2025-06-30 6:09 Ionen Wolkens
2025-06-15 16:12 Sam James
2024-12-01 7:57 Patrick Lauer
2024-07-28 8:00 Patrick Lauer
2024-03-12 2:25 Sam James
2024-03-12 2:25 Sam James
2024-03-12 2:25 Sam James
2024-03-08 19:26 Sam James
2023-12-23 16:10 罗百科
2023-12-23 10:43 罗百科
2023-10-24 8:12 罗百科
2023-10-19 10:38 罗百科
2023-10-09 12:34 罗百科
2023-09-03 6:31 罗百科
2023-03-02 8:53 罗百科
2023-02-22 16:16 Sam James
2023-02-08 4:18 Sam James
2023-02-08 4:18 Sam James
2023-02-01 9:53 Andreas Sturmlechner
2022-12-20 9:26 罗百科
2022-11-19 11:50 Benda XU
2022-08-06 14:23 Benda XU
2022-06-22 13:21 Benda XU
2021-08-19 19:46 Craig Andrews
2021-06-28 20:05 Craig Andrews
2021-04-27 13:16 Craig Andrews
2021-04-08 19:18 Craig Andrews
2020-12-21 12:55 Craig Andrews
2020-12-06 19:04 Craig Andrews
2020-11-15 12:43 Craig Andrews
2020-11-13 21:07 Craig Andrews
2020-09-20 21:01 Craig Andrews
2020-09-20 20:54 Craig Andrews
2020-09-20 20:54 Craig Andrews
2020-09-08 16:22 Craig Andrews
2020-08-25 21:08 Craig Andrews
2020-08-22 17:49 Craig Andrews
2020-04-01 19:33 Craig Andrews
2020-03-02 0:39 Craig Andrews
2020-02-29 4:36 Craig Andrews
2020-01-02 12:59 Craig Andrews
2019-11-24 17:10 Craig Andrews
2019-10-05 14:32 Craig Andrews
2019-09-30 15:23 Craig Andrews
2019-08-20 18:25 Craig Andrews
2019-08-14 20:54 Craig Andrews
2019-08-07 17:38 Craig Andrews
2019-08-07 17:38 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=1625973934.528d59f18a7a1b17acedb4628e22de3fb29c0b5b.candrews@gentoo \
--to=candrews@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