From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 44886158041 for ; Tue, 12 Mar 2024 02:25:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9D284E2A14; Tue, 12 Mar 2024 02:25:50 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7B4E8E2A14 for ; Tue, 12 Mar 2024 02:25:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7D617343010 for ; Tue, 12 Mar 2024 02:25:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 05382151A for ; Tue, 12 Mar 2024 02:25:48 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1710210285.ba8d8948c6a0b1957fed4b591bd65bd864ac8982.sam@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-5.3.3-r1.ebuild dev-libs/rocr-runtime/rocr-runtime-5.4.3-r1.ebuild dev-libs/rocr-runtime/rocr-runtime-5.5.1.ebuild dev-libs/rocr-runtime/rocr-runtime-5.7.1-r2.ebuild dev-libs/rocr-runtime/rocr-runtime-6.0.0-r1.ebuild X-VCS-Directories: dev-libs/rocr-runtime/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: ba8d8948c6a0b1957fed4b591bd65bd864ac8982 X-VCS-Branch: master Date: Tue, 12 Mar 2024 02:25:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 17c982b1-9c15-4ff5-9603-d8a54478f36f X-Archives-Hash: fc9c8afebeaa40263e15fef0c81d8a88 commit: ba8d8948c6a0b1957fed4b591bd65bd864ac8982 Author: Eli Schwartz gmail com> AuthorDate: Tue Mar 12 01:04:36 2024 +0000 Commit: Sam James gentoo 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 gmail.com> Signed-off-by: Sam James 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