From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/rocr-runtime/
Date: Tue, 12 Mar 2024 02:25:47 +0000 (UTC) [thread overview]
Message-ID: <1710210284.c4d27d80a6c8b0e9c0812018bdeb7d870fd16aa8.sam@gentoo> (raw)
commit: c4d27d80a6c8b0e9c0812018bdeb7d870fd16aa8
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Tue Mar 12 00:47:05 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> 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 <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> 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
}
next reply other threads:[~2024-03-12 2:25 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-12 2:25 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-06-30 6:09 [gentoo-commits] repo/gentoo:master commit in: dev-libs/rocr-runtime/ 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-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-07-11 3:26 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=1710210284.c4d27d80a6c8b0e9c0812018bdeb7d870fd16aa8.sam@gentoo \
--to=sam@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