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 90AFB158041 for ; Tue, 12 Mar 2024 02:25:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 715BBE2A12; 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 52CB5E2A12 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 63EBF343004 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 DF07B1519 for ; Tue, 12 Mar 2024 02:25:47 +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: <1710210284.c4d27d80a6c8b0e9c0812018bdeb7d870fd16aa8.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.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: c4d27d80a6c8b0e9c0812018bdeb7d870fd16aa8 X-VCS-Branch: master Date: Tue, 12 Mar 2024 02:25:47 +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: d9983941-2154-4a5e-9ef9-73a5f9619756 X-Archives-Hash: d072dc74728b9a32c14db400441799eb commit: c4d27d80a6c8b0e9c0812018bdeb7d870fd16aa8 Author: Eli Schwartz gmail com> AuthorDate: Tue Mar 12 00:47:05 2024 +0000 Commit: Sam James gentoo org> CommitDate: Tue Mar 12 02:24:44 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4d27d80 dev-libs/rocr-runtime: remove incorrect sed that doesn't apply * SED: the following did not cause any changes * sed -i -e "s:1.7.0:${PV}:" CMakeLists.txt || die; * no-op: -e s:1.7.0:5.7.1: I don't actually understand the reasoning for attempting to modify it at all, since the cmake function that this is an argument to (before it changed to 1.8.0) explicitly takes the value, splits it on the periods and adds each component to a VERSION_MAJOR etc cmake variable. Then it also runs git, regardless of the input value, and tries to calculate VERSION_COMMIT_COUNT. So, there was nothing to fix as far as I can tell here? The only thing sed'ing this out would ever do AFAICT is change the soname of libraries from "1.7.0" to whatever the current ${PV} is... which is NOT how sonames work, and upstream had a good reason to NOT have this be ${PV}. It's quite irrelevant now since clearly the package worked just fine despite the sed not applying, thus it *cannot* be fixing anything, and also thus, there is clearly nothing to fix. Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Sam James gentoo.org> dev-libs/rocr-runtime/rocr-runtime-5.5.1.ebuild | 7 +------ dev-libs/rocr-runtime/rocr-runtime-5.7.1-r2.ebuild | 5 ----- dev-libs/rocr-runtime/rocr-runtime-6.0.0-r1.ebuild | 5 ----- 3 files changed, 1 insertion(+), 16 deletions(-) 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 4d026cf3ce50..6982173e2eb6 100644 --- a/dev-libs/rocr-runtime/rocr-runtime-5.5.1.ebuild +++ b/dev-libs/rocr-runtime/rocr-runtime-5.5.1.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 @@ -44,11 +44,6 @@ src_prepare() { # 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 - # internal version depends on git being present and random weird magic, otherwise fallback to incoherent default value - # fix default value to be more better - - sed -i -e "s:1.7.0:${PV}:" CMakeLists.txt || die - cmake_src_prepare } 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 00615488c2d2..d449b346c13e 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 @@ -47,11 +47,6 @@ src_prepare() { # 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 - # internal version depends on git being present and random weird magic, otherwise fallback to incoherent default value - # fix default value to be more better - - sed -i -e "s:1.7.0:${PV}:" CMakeLists.txt || die - cmake_src_prepare } 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 cdd27fbbbefd..894ab93788af 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 @@ -46,11 +46,6 @@ src_prepare() { # 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 - # internal version depends on git being present and random weird magic, otherwise fallback to incoherent default value - # fix default value to be more better - - sed -i -e "s:1.7.0:${PV}:" CMakeLists.txt || die - cmake_src_prepare }