From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1301124-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1E80313933E for <garchives@archives.gentoo.org>; Sun, 11 Jul 2021 03:26:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4FE45E0636; Sun, 11 Jul 2021 03:26:05 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 141D6E0636 for <gentoo-commits@lists.gentoo.org>; Sun, 11 Jul 2021 03:26:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8A9EE33BF5D for <gentoo-commits@lists.gentoo.org>; Sun, 11 Jul 2021 03:26:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E503A174 for <gentoo-commits@lists.gentoo.org>; Sun, 11 Jul 2021 03:26:00 +0000 (UTC) From: "Craig Andrews" <candrews@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Craig Andrews" <candrews@gentoo.org> Message-ID: <1625973934.528d59f18a7a1b17acedb4628e22de3fb29c0b5b.candrews@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/rocr-runtime/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/rocr-runtime/rocr-runtime-4.0.0.ebuild dev-libs/rocr-runtime/rocr-runtime-4.1.0.ebuild dev-libs/rocr-runtime/rocr-runtime-4.2.0.ebuild X-VCS-Directories: dev-libs/rocr-runtime/ X-VCS-Committer: candrews X-VCS-Committer-Name: Craig Andrews X-VCS-Revision: 528d59f18a7a1b17acedb4628e22de3fb29c0b5b X-VCS-Branch: master Date: Sun, 11 Jul 2021 03:26:00 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d6b5b951-54f2-40bb-9805-05b8a968a4b4 X-Archives-Hash: 2421dec0b26ec30e44dfb6e13e0df275 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 }