commit: ba8d8948c6a0b1957fed4b591bd65bd864ac8982 Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com> AuthorDate: Tue Mar 12 01:04:36 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Mar 12 02:24:45 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba8d8948
dev-libs/rocr-runtime: remove another sed that doesn't apply Upstream changed this whole code around in 5.3.0 via: https://github.com/ROCm/ROCR-Runtime/commit/adae6c61e10d371f7cbc3d0e94ae2c070cab18a4 Since then, this sed has been tweaked in small ways without fundamentally changing the part that doesn't match anymore. Since the sed wasn't tested, I can only assume that the promise about system clang/llvm is outdated. ;) I believe cmake's hints logic should simply work anyway... Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> dev-libs/rocr-runtime/rocr-runtime-5.3.3-r1.ebuild | 5 +---- dev-libs/rocr-runtime/rocr-runtime-5.4.3-r1.ebuild | 5 +---- dev-libs/rocr-runtime/rocr-runtime-5.5.1.ebuild | 3 --- dev-libs/rocr-runtime/rocr-runtime-5.7.1-r2.ebuild | 3 --- dev-libs/rocr-runtime/rocr-runtime-6.0.0-r1.ebuild | 3 --- 5 files changed, 2 insertions(+), 17 deletions(-) diff --git a/dev-libs/rocr-runtime/rocr-runtime-5.3.3-r1.ebuild b/dev-libs/rocr-runtime/rocr-runtime-5.3.3-r1.ebuild index f408d4213314..2f9c72c2c2f0 100644 --- a/dev-libs/rocr-runtime/rocr-runtime-5.3.3-r1.ebuild +++ b/dev-libs/rocr-runtime/rocr-runtime-5.3.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -38,9 +38,6 @@ BDEPEND="app-editors/vim-core" # vim-core is needed for "xxd" src_prepare() { - # ... otherwise system llvm/clang is used ... - sed -e "/find_package(Clang REQUIRED HINTS /s:\${CMAKE_INSTALL_PREFIX}/llvm \${CMAKE_PREFIX_PATH}/llvm PATHS /opt/rocm/llvm:$(get_llvm_prefix ${LLVM_MAX_SLOT}):" -i image/blit_src/CMakeLists.txt || die - # Gentoo installs "*.bc" to "/usr/lib" instead of a "[path]/bitcode" directory ... sed -e "s:-O2:--rocm-path=${EPREFIX}/usr/lib/ -O2:" -i image/blit_src/CMakeLists.txt || die diff --git a/dev-libs/rocr-runtime/rocr-runtime-5.4.3-r1.ebuild b/dev-libs/rocr-runtime/rocr-runtime-5.4.3-r1.ebuild index f6a8a5598f2a..5ee12fb5d5ba 100644 --- a/dev-libs/rocr-runtime/rocr-runtime-5.4.3-r1.ebuild +++ b/dev-libs/rocr-runtime/rocr-runtime-5.4.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -38,9 +38,6 @@ BDEPEND="app-editors/vim-core" # vim-core is needed for "xxd" src_prepare() { - # ... otherwise system llvm/clang is used ... - sed -e "/find_package(Clang REQUIRED HINTS /s:\${CMAKE_INSTALL_PREFIX}/llvm \${CMAKE_PREFIX_PATH}/llvm PATHS /opt/rocm/llvm:$(get_llvm_prefix ${LLVM_MAX_SLOT}):" -i image/blit_src/CMakeLists.txt || die - # Gentoo installs "*.bc" to "/usr/lib" instead of a "[path]/bitcode" directory ... sed -e "s:-O2:--rocm-path=${EPREFIX}/usr/lib/ -O2:" -i image/blit_src/CMakeLists.txt || die diff --git a/dev-libs/rocr-runtime/rocr-runtime-5.5.1.ebuild b/dev-libs/rocr-runtime/rocr-runtime-5.5.1.ebuild index 6982173e2eb6..36f37da462ab 100644 --- a/dev-libs/rocr-runtime/rocr-runtime-5.5.1.ebuild +++ b/dev-libs/rocr-runtime/rocr-runtime-5.5.1.ebuild @@ -38,9 +38,6 @@ BDEPEND="app-editors/vim-core" # vim-core is needed for "xxd" src_prepare() { - # ... otherwise system llvm/clang is used ... - sed -e "/find_package(Clang REQUIRED HINTS /s:\${CMAKE_INSTALL_PREFIX}/llvm \${CMAKE_PREFIX_PATH}/llvm PATHS /opt/rocm/llvm:$(get_llvm_prefix ${LLVM_MAX_SLOT}):" -i image/blit_src/CMakeLists.txt || die - # Gentoo installs "*.bc" to "/usr/lib" instead of a "[path]/bitcode" directory ... sed -e "s:-O2:--rocm-path=${EPREFIX}/usr/lib/ -O2:" -i image/blit_src/CMakeLists.txt || die diff --git a/dev-libs/rocr-runtime/rocr-runtime-5.7.1-r2.ebuild b/dev-libs/rocr-runtime/rocr-runtime-5.7.1-r2.ebuild index d449b346c13e..edaaebfdc50f 100644 --- a/dev-libs/rocr-runtime/rocr-runtime-5.7.1-r2.ebuild +++ b/dev-libs/rocr-runtime/rocr-runtime-5.7.1-r2.ebuild @@ -41,9 +41,6 @@ BDEPEND="app-editors/vim-core" # vim-core is needed for "xxd" src_prepare() { - # ... 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 - # Gentoo installs "*.bc" to "/usr/lib" instead of a "[path]/bitcode" directory ... sed -e "s:-O2:--rocm-path=${EPREFIX}/usr/lib/ -O2:" -i image/blit_src/CMakeLists.txt || die diff --git a/dev-libs/rocr-runtime/rocr-runtime-6.0.0-r1.ebuild b/dev-libs/rocr-runtime/rocr-runtime-6.0.0-r1.ebuild index 894ab93788af..02da6889b8cd 100644 --- a/dev-libs/rocr-runtime/rocr-runtime-6.0.0-r1.ebuild +++ b/dev-libs/rocr-runtime/rocr-runtime-6.0.0-r1.ebuild @@ -40,9 +40,6 @@ BDEPEND="app-editors/vim-core" # vim-core is needed for "xxd" src_prepare() { - # ... 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 - # Gentoo installs "*.bc" to "/usr/lib" instead of a "[path]/bitcode" directory ... sed -e "s:-O2:--rocm-path=${EPREFIX}/usr/lib/ -O2:" -i image/blit_src/CMakeLists.txt || die
