summaryrefslogtreecommitdiff
path: root/dev-util
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/Manifest.gzbin64929 -> 64942 bytes
-rw-r--r--dev-util/diffoscope/Manifest2
-rw-r--r--dev-util/diffoscope/diffoscope-260.ebuild124
-rw-r--r--dev-util/rocm-smi/Manifest4
-rw-r--r--dev-util/rocm-smi/files/rocm-smi-5.7.1-set-soversion.patch64
-rw-r--r--dev-util/rocm-smi/rocm-smi-5.7.1-r1.ebuild (renamed from dev-util/rocm-smi/rocm-smi-5.7.1.ebuild)5
6 files changed, 172 insertions, 27 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index e49491ee081a..1bd568d58e71 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
Binary files differ
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index b5b5df17ddfc..f3fc6524af2b 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -2,8 +2,10 @@ DIST diffoscope-247.tar.bz2 3091118 BLAKE2B cb41b98d439c123b5ee5f458d635f08afebd
DIST diffoscope-257.tar.bz2 3112404 BLAKE2B cdd7901bdb7cfddb77d165d0084bfc4d9ad1c053bbaee67939acef4cbc0ecb81c2c7443fb7c37bc02b3884433e473dd5cf2afaad28b8535fab70b628df3561e4 SHA512 236ff8fc7e74db2201dfbc0757e6c87aa769c69805319a4ad95faec82f1b0d842a54aaf1c0a0f8f7d74d59c078a696714d92a940d1847530288f95be66dd3dc2
DIST diffoscope-258.tar.bz2 3111795 BLAKE2B 115db345f5ff4b79045a6297511c9487d7544b80f41161d7b7d6fc6711bce2869603ca6d044c7fbc00b987415cfbc8b359ecbf7a2bdf2061ff2d79e37b903fba SHA512 962920b3493f1f0c99ff109f94f723be60cb2941320118b344aefef21eacccb41f42c429bf7a08a67ce17e6624bac8d509548f14948a357b9ea568a16d0e4213
DIST diffoscope-259.tar.bz2 3113323 BLAKE2B 58b3bbed61d56ee3782b9d6ff146d2bbfdde1be4cdfba36d2d173a795206bf64a74dbece9e90f0b30ea025d5e353b6820bb4047e767875bb099ec9f659e7b5bd SHA512 32e98806430e353107d4426176c84e17a1d7b2c03a1bdcd3093e67d3b3302800402d26189c1e24cbfdaf28182041c4df857335b608c9ff721408076057f9557c
+DIST diffoscope-260.tar.bz2 3116714 BLAKE2B 72fa7e60f734c82079417404f2850809835d770dbdf1472958daaf0a0b8a0f2e60162ddb0ff56ae711c04984d0680da526238e9e8f34014858b38e83dcc9c8dd SHA512 e33758c9ac28f1b390ce06b0effacc922577faa6f12d5fe89152e9b0223271be7003a03540827d92081be7922705ce09c63bd517e509e4a73beb3415743eef87
EBUILD diffoscope-247.ebuild 4043 BLAKE2B 511752eff66f2ab826c63ff90f43643a804ba98eb865ec401f20bb12da9212fa17a3f5674a279be3e32cbbb72fb39a585d81ebd1824df859e613ea4dfd0eb09f SHA512 7218505a6938db6fcdaa7f7df7b756932f95d5d3b6065dd702af3b1c84c8267b5afb672e666309c5d3a08ebc8f66170102f62fbf6892b54388ce71963bd98409
EBUILD diffoscope-257.ebuild 3681 BLAKE2B c4f1f1661fd97e6b04eff67c1aae1db9893df9b5e91aa54aed8fedd4fa1ef7fa071f799c76377db3687f0c7b073be41eabac629118e38e063d8f29d8493e996c SHA512 0f24c5d7d22c8bbeae42d3cab7f7e25c347ac1f3d80320a92e22b33c3447b439a3794e443f939fa3861c82a2c0170b1ac2a6f98f20312a800147d03ce6a22dba
EBUILD diffoscope-258.ebuild 3682 BLAKE2B 9416955c1c9414ea2bcfb9ca5138638a3963dc71ec5443d6d993e3d132a566f62e613dd6dea2e38f26b3af6a176d620da2fabbe2159a8f979d2f8d91ae49332f SHA512 6a1cf8404cb306e7ddba0d19e591f62b622e616118f60285612a75991df02270d772eb647d1649f720da5c709312a4c18ad1eb86d9941c7f8512339fba7904d4
EBUILD diffoscope-259.ebuild 3682 BLAKE2B 9416955c1c9414ea2bcfb9ca5138638a3963dc71ec5443d6d993e3d132a566f62e613dd6dea2e38f26b3af6a176d620da2fabbe2159a8f979d2f8d91ae49332f SHA512 6a1cf8404cb306e7ddba0d19e591f62b622e616118f60285612a75991df02270d772eb647d1649f720da5c709312a4c18ad1eb86d9941c7f8512339fba7904d4
+EBUILD diffoscope-260.ebuild 3682 BLAKE2B 9416955c1c9414ea2bcfb9ca5138638a3963dc71ec5443d6d993e3d132a566f62e613dd6dea2e38f26b3af6a176d620da2fabbe2159a8f979d2f8d91ae49332f SHA512 6a1cf8404cb306e7ddba0d19e591f62b622e616118f60285612a75991df02270d772eb647d1649f720da5c709312a4c18ad1eb86d9941c7f8512339fba7904d4
MISC metadata.xml 2086 BLAKE2B b05c2c3c425a990f64aea25e9dda3e1afb410068d90e034d5d9df7c76363613d309f8bc57c70284f2e607a3e2096a0132724dddba8df487bda3046d8ed7aefa1 SHA512 8c86ddad7fda722956931d73a6f5dfa8e43c25623edb3b20bf3e68765b04ed4d20ba31b68315812978a9546b3c678597fd41132a4a6ad4658ba9fa5f79cfc90d
diff --git a/dev-util/diffoscope/diffoscope-260.ebuild b/dev-util/diffoscope/diffoscope-260.ebuild
new file mode 100644
index 000000000000..7db31ced97d2
--- /dev/null
+++ b/dev-util/diffoscope/diffoscope-260.ebuild
@@ -0,0 +1,124 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="ncurses"
+inherit distutils-r1
+
+DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
+HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
+# We could use pypi, but upstream provide distribution tarballs, so let's use those.
+# TODO: verify-sig
+SRC_URI="https://diffoscope.org/archive/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
+IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
+find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
+mono opendocument pascal pdf postscript R rpm sqlite squashfs
+ssh tar test tcpdump zip zlib zstd"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ || (
+ dev-python/python-magic[${PYTHON_USEDEP}]
+ sys-apps/file[python,${PYTHON_USEDEP}]
+ )
+ dev-python/libarchive-c[${PYTHON_USEDEP}]
+ dev-python/distro[${PYTHON_USEDEP}]
+ dev-python/tlsh[${PYTHON_USEDEP}]
+ acl? ( sys-apps/acl )
+ binutils? ( sys-devel/binutils )
+ bzip2? ( app-arch/bzip2 )
+ libcaca? ( media-libs/libcaca )
+ colord? ( x11-misc/colord )
+ cpio? ( app-alternatives/cpio )
+ diff? ( sys-apps/diffutils )
+ docx? ( app-text/docx2txt )
+ dtc? ( sys-apps/dtc )
+ e2fsprogs? ( sys-fs/e2fsprogs )
+ file? ( sys-apps/file )
+ find? ( sys-apps/findutils )
+ gettext? ( sys-devel/gettext )
+ gif? ( media-libs/giflib )
+ gpg? ( app-crypt/gnupg )
+ haskell? ( dev-lang/ghc )
+ hdf5? ( sci-libs/hdf5 )
+ hex? ( app-editors/vim-core )
+ imagemagick? ( media-gfx/imagemagick )
+ iso? ( app-cdr/cdrtools )
+ java? ( virtual/jdk )
+ llvm? ( sys-devel/llvm )
+ lzma? ( app-arch/xz-utils )
+ mono? ( dev-lang/mono )
+ opendocument? ( app-text/odt2txt )
+ pascal? ( dev-lang/fpc )
+ pdf? (
+ app-text/pdftk
+ app-text/poppler
+ dev-python/pypdf[${PYTHON_USEDEP}]
+ )
+ postscript? ( app-text/ghostscript-gpl )
+ R? ( dev-lang/R )
+ rpm? ( app-arch/rpm )
+ sqlite? ( dev-db/sqlite:3 )
+ squashfs? ( sys-fs/squashfs-tools )
+ ssh? ( virtual/openssh )
+ tar? ( app-arch/tar )
+ tcpdump? ( net-analyzer/tcpdump )
+ zip? ( app-arch/unzip )
+ zlib? ( app-arch/gzip )
+ zstd? ( app-arch/zstd )
+"
+
+# pull in optional tools for tests:
+# img2txt: bug #797688
+# docx2txt: bug #797688
+BDEPEND="
+ test? (
+ app-arch/p7zip
+ app-text/docx2txt
+ app-text/html2text
+ media-libs/libcaca
+ virtual/imagemagick-tools[jpeg]
+ )
+"
+
+EPYTEST_DESELECT=(
+ # Test seems to use different tarball
+ tests/test_presenters.py::test_text_proper_indentation
+
+ # Needs triage
+ tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
+ tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
+ tests/comparators/test_gif.py::test_has_visuals
+
+ # img2txt based failures, bug #797688
+ tests/comparators/test_ico_image.py::test_diff
+ tests/comparators/test_ico_image.py::test_diff_meta
+ tests/comparators/test_ico_image.py::test_diff_meta2
+ tests/comparators/test_ico_image.py::test_has_visuals
+ tests/comparators/test_jpeg_image.py::test_diff
+ tests/comparators/test_jpeg_image.py::test_compare_non_existing
+ tests/comparators/test_jpeg_image.py::test_diff_meta
+ tests/comparators/test_jpeg_image.py::test_has_visuals
+
+ # docx2txt based falures, bug #797688
+ tests/comparators/test_docx.py::test_diff
+
+ # Formatting
+ tests/test_source.py::test_code_is_black_clean
+
+ # Fails on ZFS
+ tests/test_main.py::test_non_unicode_filename
+
+ # Fails on (unreleased) LLVM 16 with minor difference
+ #tests/comparators/test_macho.py::test_llvm_diff
+ #tests/comparators/test_elf.py::test_libmix_differences
+)
+
+distutils_enable_tests pytest
diff --git a/dev-util/rocm-smi/Manifest b/dev-util/rocm-smi/Manifest
index 2637b1b5e441..072bf6557d98 100644
--- a/dev-util/rocm-smi/Manifest
+++ b/dev-util/rocm-smi/Manifest
@@ -3,12 +3,12 @@ AUX rocm-smi-5.1.3-detect-builtin-amdgpu.patch 983 BLAKE2B c1d926ce5ce1bef272f71
AUX rocm-smi-5.4.2-detect-builtin-amdgpu.patch 1071 BLAKE2B 1957d49b0c3c1f9db24add59b8dd464c6ce8571ded2601cb259a0686938e4fb718b6affd99c366f6e8aa360f53034c0e7c231dd3518bcab84bb8d5a755c4ebb5 SHA512 a531b3ae4b73dcd03e6f3de3da4dbf1250e6a6d05ec052fa8ff412f65233b5fcd418a7128f9b913aa71e1bbf970ba5b74c7b407a0654e1030f695e7f13ebd5dc
AUX rocm-smi-5.7.1-no-strip.patch 1405 BLAKE2B 703eafdfe552afe3d2d4d67af2e847b42669b09b8b553b7a77e46f39f3a960174380187f5927b3a4c686dded54b4d9fa6be6c5c862ea2a023bf84224de3be5b6 SHA512 60806893c6ae7fe4c66ae927528f0db13c75f74c464885a251ac5e021bf61aaa5f529cca3de72c9c49dd993375039e0052bbccb4c3065a17849852c9283e20c5
AUX rocm-smi-5.7.1-remove-example.patch 560 BLAKE2B 6f541822947e6f458e5c553c307e137de63db884d7933dd5dad752990c7f4c15d02c47d66dd399d053368d79ab0b6d8237adb1d7c3fae28a9b03d0c34006d027 SHA512 e3be170af0d6f8b4e238e9f9940ac91748fd9b45a0f43fb1c7286d676c2a878a05aeb260e6248bc66ba93adcea5d4c7bc22ce6db6a248cee20d678fdfa7d07ec
-AUX rocm-smi-5.7.1-set-soversion.patch 4614 BLAKE2B 0e7f520a2e01536c2e6248e78394857d3d513d93b8cc25a8236e2e04b4d3046ce4b5b0c51beee49eec2943cdb220983dbea223b2082c5e7df7ed086a076e49b1 SHA512 4ee5074617753c9ea0d7a4b6b89e1e6499df6a560e2b201a4c909ccf76000e5fa89d26ffbe7fb7e597ac208ff64fbd7ed1dc61a209fa2c57dcad8843c0282d0b
+AUX rocm-smi-5.7.1-set-soversion.patch 5234 BLAKE2B b2e40d803d0511e98c87125dae05a415b2ddf38b28f774edfe6fca1bf552e630f872631b3cfe82c1302a1c2d7be83bf7a6b4e67c0f8eb271612999eaec3cba68 SHA512 af51867d0baeca303932b0d38f716a657bf14f57e595056694eadb2c120c741e03615837eee9b86932f1fa04815c2803b6115e5e2cb81ea51b07d558155eb398
DIST rocm-smi-5.1.3.tar.gz 1701386 BLAKE2B c5e779f5c33fec0b1b39b09c758dfadd3c24e28f15381593f2959e5c2fb9f49af3a7ca1f9ab7d6bf34c5af4fbe3f0c0ae20c6c049cbf9421a9184735bb4a64a2 SHA512 7bf7af2b42a035c298c2f9009b6123671af41f9ca1a50607cfa362f39dbd82ff88f8c13ece6c4edab585edadd9072ed096a400dd3850851e1beef3633a8eb14e
DIST rocm-smi-5.4.2.tar.gz 1553259 BLAKE2B 0560e115028caafb1d5dd8892cfa677431b792714ecd8c75f31451fa7685d1c7070cbd687c894d7eefd112de5e2df9aa7895aa57821db207dffc4e8890898638 SHA512 0fd651593df0ebbcb2c2327d030d2674efacdb6e883daa5a8adf733db2bde3e5d16dc304856221f4bb07a3cd834944ffcc7ebd689624f7ba24ffd6c262ba74b8
DIST rocm-smi-5.7.1.tar.gz 801646 BLAKE2B b4799bbdaeb7203c16117cd30511d589a2b96e15801bb9f1382fe7a4d87d43e1d4b458d6923b6ebd602fdccba74bd65bcb98766dbd83c48fc3e02219be8c1022 SHA512 ad364278f137228a39108c93d482635137ea2724a5a39debb5b32329493ebf5c706dcf3863e2e24b6f0b6286f3877942277f5ae447446f155518972b957f7d9d
EBUILD rocm-smi-5.1.3-r1.ebuild 1850 BLAKE2B 9f7cbf7d5ec55ac112980609f8a924b5678aa4fa5cf75cdda3d80ad90c15ecb5f1d129a21c0248985d7f4e792abbcd3f0d822e8e10e76314ebaa5fc240632ae9 SHA512 30181897335c17d81a9d9dce8c4417c62fe66a20d557251158bf2a8ffe6fc075e51878a4bd42708ef47a89022fd03a97b4dccca1f5ee450d098cf66af1095158
EBUILD rocm-smi-5.4.2.ebuild 1454 BLAKE2B 1025768cbe75bb5d815631868c8d9f72ba6dd19a2a0483b0f6fa992a89af4b018731ab247df3679bb836e88e961d80cc94f6550dab70dc00ba25e3d642f5af74 SHA512 5e124efaa71e74ab5b5063244d757f8e9eddc22dbf10d1878c1a5d7ad04dbc88b366470596d4ee48bb489b26bb30e90f8fab51ca756fa0315e5a673971ae8d7e
-EBUILD rocm-smi-5.7.1.ebuild 1467 BLAKE2B 7812eaf57110f53ab96ace5656db11ad89599a90b0af6f8163c7eb3f17649cb3837eacf6475abbc117a1ea2b416d7426399dca3508a69e2fffc7e871c1e8ec5b SHA512 748a1722ce13c714837fb8b586a31e0b2ae4e36968829e027217100159fa5adf1c4fef0da0b0d1d30b50dfdaed24f09064159abf9175d2efb6b5b138e758c778
+EBUILD rocm-smi-5.7.1-r1.ebuild 1549 BLAKE2B f89e3e829ae078fc7553b0e17c44ed4a5aa92427f8b873e9076171d267122b57338749dfc8637d62992025b981227e55797f8b70a14f1e00addfc7893310521e SHA512 14e4b3b98b860a42dd5bfe75a90693cddc6e5c61652583134884d881e43e73fc5d974c9b2b71ad22912fec29fd150357b9b5e6e960187568b53954d7154ae4cc
EBUILD rocm-smi-9999.ebuild 1454 BLAKE2B 1025768cbe75bb5d815631868c8d9f72ba6dd19a2a0483b0f6fa992a89af4b018731ab247df3679bb836e88e961d80cc94f6550dab70dc00ba25e3d642f5af74 SHA512 5e124efaa71e74ab5b5063244d757f8e9eddc22dbf10d1878c1a5d7ad04dbc88b366470596d4ee48bb489b26bb30e90f8fab51ca756fa0315e5a673971ae8d7e
MISC metadata.xml 661 BLAKE2B ed6ec563956132012b44907f348091135c7a463fc47a51ac0726e7749da9a4c33811df87442e576fb510799a50c14949cd20c8ca10a5850ee941a8794b70ef7d SHA512 c047963068b4ccefb73539ecd91b4c3310f0863a674acb15e9843dda7f0c917616dc8cbfe5f859e42d9ee25323bf1b66b1ce7fbe9a2e8292963ac38aa0bd72f3
diff --git a/dev-util/rocm-smi/files/rocm-smi-5.7.1-set-soversion.patch b/dev-util/rocm-smi/files/rocm-smi-5.7.1-set-soversion.patch
index 203b179d3faa..f79276d7ab8d 100644
--- a/dev-util/rocm-smi/files/rocm-smi-5.7.1-set-soversion.patch
+++ b/dev-util/rocm-smi/files/rocm-smi-5.7.1-set-soversion.patch
@@ -5,7 +5,7 @@ This patch repeats approach of similar patch from Debian, additionally removing
https://salsa.debian.org/rocm-team/rocm-smi-lib/-/blob/master/debian/patches/0007-rocm_smi64-soversion.patch
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -30,27 +30,6 @@ set(SHARE_INSTALL_PREFIX
+@@ -30,18 +30,6 @@ set(SHARE_INSTALL_PREFIX
"share/${ROCM_SMI}"
CACHE STRING "Tests and Example install directory")
@@ -21,21 +21,12 @@ https://salsa.debian.org/rocm-team/rocm-smi-lib/-/blob/master/debian/patches/000
-set(${AMD_SMI_LIBS_TARGET}_VERSION_PATCH "0")
-set(${AMD_SMI_LIBS_TARGET}_VERSION_BUILD "0")
-
--# The following default version values should be updated as appropriate for
--# ABI breaks (update MAJOR and MINOR), and ABI/API additions (update MINOR).
--# Until ABI stabilizes VERSION_MAJOR will be 0. This should be over-ridden
--# by git tags (through "git describe") when they are present.
--set(PKG_VERSION_MAJOR 1)
--set(PKG_VERSION_MINOR 0)
--set(PKG_VERSION_PATCH 0)
--set(PKG_VERSION_NUM_COMMIT 0)
--
- ## Define default variable and variables for the optional build target
- ## rocm_smi_lib-dev
- set(CMAKE_INSTALL_PREFIX "/opt/rocm" CACHE STRING "Default installation directory.")
+ # The following default version values should be updated as appropriate for
+ # ABI breaks (update MAJOR and MINOR), and ABI/API additions (update MINOR).
+ # Until ABI stabilizes VERSION_MAJOR will be 0. This should be over-ridden
--- a/oam/CMakeLists.txt
+++ b/oam/CMakeLists.txt
-@@ -29,23 +29,10 @@ set(OAM_NAME "oam")
+@@ -29,23 +29,11 @@ set(OAM_NAME "oam")
set(OAM_COMPONENT "lib${OAM_NAME}")
set(OAM_TARGET "${OAM_NAME}")
@@ -56,13 +47,23 @@ https://salsa.debian.org/rocm-team/rocm-smi-lib/-/blob/master/debian/patches/000
-else()
- set(SO_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}")
-endif ()
-+set(VERSION_MAJOR "1")
-+set(VERSION_MINOR "0")
++set(VERSION_MAJOR "@VERSION_MAJOR@")
++set(VERSION_MINOR "@VERSION_MINOR@")
+
-+set(SO_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}")
++set(SO_VERSION_MAJOR "1")
++set(SO_VERSION_STRING "1.0")
set(${OAM_NAME}_VERSION_MAJOR "${VERSION_MAJOR}")
set(${OAM_NAME}_VERSION_MINOR "${VERSION_MINOR}")
set(${OAM_NAME}_VERSION_PATCH "0")
+@@ -78,7 +66,7 @@ target_include_directories(${OAM_TARGET} PRIVATE
+
+ ## Set the VERSION and SOVERSION values
+ set_property(TARGET ${OAM_TARGET} PROPERTY
+- SOVERSION "${VERSION_MAJOR}")
++ SOVERSION "${SO_VERSION_MAJOR}")
+ set_property(TARGET ${OAM_TARGET} PROPERTY
+ VERSION "${SO_VERSION_STRING}")
+
--- a/python_smi_tools/rsmiBindings.py.in
+++ b/python_smi_tools/rsmiBindings.py.in
@@ -9,19 +9,9 @@ from enum import Enum
@@ -90,7 +91,7 @@ https://salsa.debian.org/rocm-team/rocm-smi-lib/-/blob/master/debian/patches/000
--- a/rocm_smi/CMakeLists.txt
+++ b/rocm_smi/CMakeLists.txt
-@@ -31,17 +31,8 @@ set(ROCM_SMI_TARGET "${ROCM_SMI}64")
+@@ -31,23 +31,10 @@ set(ROCM_SMI_TARGET "${ROCM_SMI}64")
## Include common cmake modules
include(utils)
@@ -105,8 +106,25 @@ https://salsa.debian.org/rocm-team/rocm-smi-lib/-/blob/master/debian/patches/000
-get_version_from_tag("5.0.0.0" ${SO_VERSION_GIT_TAG_PREFIX} GIT)
-
-# VERSION_* variables should be set by get_version_from_tag
-+set(VERSION_MAJOR "1")
-+set(VERSION_MINOR "0")
- if ( ${ROCM_PATCH_VERSION} )
- set ( VERSION_PATCH ${ROCM_PATCH_VERSION})
- set(SO_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
+-if ( ${ROCM_PATCH_VERSION} )
+- set ( VERSION_PATCH ${ROCM_PATCH_VERSION})
+- set(SO_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
+-else()
+- set(SO_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}")
+-endif ()
++set(VERSION_MAJOR "@VERSION_MAJOR@")
++set(VERSION_MINOR "@VERSION_MINOR@")
++set(SO_VERSION_MAJOR "1")
++set(SO_VERSION_STRING "1.0")
+ set(${ROCM_SMI}_VERSION_MAJOR "${VERSION_MAJOR}")
+ set(${ROCM_SMI}_VERSION_MINOR "${VERSION_MINOR}")
+ set(${ROCM_SMI}_VERSION_PATCH "0")
+@@ -99,7 +86,7 @@ endif()
+
+ ## Set the VERSION and SOVERSION values
+ set_property(TARGET ${ROCM_SMI_TARGET} PROPERTY
+- SOVERSION "${VERSION_MAJOR}")
++ SOVERSION "${SO_VERSION_MAJOR}")
+ set_property(TARGET ${ROCM_SMI_TARGET} PROPERTY
+ VERSION "${SO_VERSION_STRING}")
+
diff --git a/dev-util/rocm-smi/rocm-smi-5.7.1.ebuild b/dev-util/rocm-smi/rocm-smi-5.7.1-r1.ebuild
index 5fd0811bd980..86c31040d841 100644
--- a/dev-util/rocm-smi/rocm-smi-5.7.1.ebuild
+++ b/dev-util/rocm-smi/rocm-smi-5.7.1-r1.ebuild
@@ -37,8 +37,9 @@ PATCHES=(
src_prepare() {
cmake_src_prepare
- sed "s/\${PKG_VERSION_STR}/${PV}/g" \
- -i CMakeLists.txt -i oam/CMakeLists.txt -i rocm_smi/CMakeLists.txt || die
+ sed "s/\${PKG_VERSION_STR}/${PV}/" -i CMakeLists.txt || die
+ sed -e "s/@VERSION_MAJOR@/$(ver_cut 1)/ ; s/@VERSION_MINOR@/$(ver_cut 2)/" \
+ -i oam/CMakeLists.txt -i rocm_smi/CMakeLists.txt || die
}
src_configure() {
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 19:14:35 +0000