public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Tom Rix <Tom.Rix@amd.com>
To: git-commits@fedoraproject.org
Subject: [rpms/hipsparse] rawhide: merge compat changes
Date: Sat, 20 Jun 2026 15:51:53 GMT [thread overview]
Message-ID: <178197071383.1.16450826882991228150.rpms-hipsparse-a6fb66b1a8f1@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/hipsparse
Branch : rawhide
Commit : a6fb66b1a8f1aba4600404ede5172b0de19f36bc
Author : Tom Rix <Tom.Rix@amd.com>
Date : 2026-06-20T08:51:29-07:00
Stats : +25/-5 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/hipsparse/c/a6fb66b1a8f1aba4600404ede5172b0de19f36bc?branch=rawhide
Log:
merge compat changes
Signed-off-by: Tom Rix <Tom.Rix@amd.com>
---
diff --git a/hipsparse.spec b/hipsparse.spec
index e34b039..89ab3d1 100644
--- a/hipsparse.spec
+++ b/hipsparse.spec
@@ -42,12 +42,12 @@
%global pkg_libdir lib
%global pkg_prefix %{_prefix}/lib64/rocm/rocm-%{rocm_release}
%global pkg_suffix %{rocm_release}
-%global pkg_module rocm%{pkg_suffix}
+%global skip_install_rpath OFF
%else
%global pkg_libdir %{_lib}
%global pkg_prefix %{_prefix}
%global pkg_suffix %{nil}
-%global pkg_module default
+%global skip_install_rpath ON
%endif
%if 0%{?suse_version}
@@ -100,7 +100,7 @@ Version: %{rocm_version}
%if %{with preview}
Release: 0%{?dist}
%else
-Release: 6%{?dist}
+Release: 7%{?dist}
%endif
Summary: ROCm SPARSE marshaling library
License: MIT
@@ -109,10 +109,12 @@ URL: https://github.com/ROCm/rocm-libraries
Source0: %{url}/releases/download/%{pkg_src}/%{upstreamname}.tar.gz#/%{upstreamname}-%{version}.tar.gz
%if %{without preview}
-# Too much change between 7.2 and 7.12+
+# Too much changed between 7.2 and 7.12+, this will need to be refactored.
+# Removes the automatic downloading and conditional copying of test matrices
Patch1: 0001-hipsparse-change-test-download-dir.patch
%endif
+BuildRequires: chrpath
BuildRequires: cmake
BuildRequires: gcc-c++
%if 0%{?suse_version}
@@ -123,6 +125,7 @@ BuildRequires: gcc-gfortran
BuildRequires: rocm-cmake%{pkg_suffix}
BuildRequires: rocm-comgr%{pkg_suffix}-devel
BuildRequires: rocm-compilersupport%{pkg_suffix}-macros
+BuildRequires: rocm-filesystem%{pkg_suffix}
BuildRequires: rocm-hip%{pkg_suffix}-devel
BuildRequires: rocm-runtime%{pkg_suffix}-devel
BuildRequires: rocm-rpm-macros%{pkg_suffix}
@@ -149,6 +152,9 @@ BuildRequires: rocm-clang-tools-extra%{pkg_suffix}
%endif
Provides: hipsparse%{pkg_suffix} = %{version}-%{release}
+Requires: rocm-filesystem%{pkg_suffix}
+Requires: rocm-hip%{pkg_suffix}
+Requires: rocsparse%{pkg_suffix}
# Only x86_64 works right now:
ExclusiveArch: x86_64
@@ -177,6 +183,7 @@ Summary: Shared libraries for %{name}
Summary: Libraries and headers for %{name}
Requires: %{pkg_name}%{?_isa} = %{version}-%{release}
Provides: hipsparse%{pkg_suffix}-devel = %{version}-%{release}
+Requires: rocm-filesystem%{pkg_suffix}
%description devel
%{summary}
@@ -185,6 +192,7 @@ Provides: hipsparse%{pkg_suffix}-devel = %{version}-%{release}
%package test
Summary: Tests for %{name}
Requires: %{pkg_name}%{?_isa} = %{version}-%{release}
+Requires: rocm-filesystem%{pkg_suffix}
%description test
%{summary}
@@ -254,12 +262,14 @@ sed -i -e '/test_hyb2csr/d' clients/tests/CMakeLists.txt
-DCMAKE_EXPORT_COMPILE_COMMANDS=%{build_compile_db} \
-DCMAKE_INSTALL_LIBDIR=%{pkg_libdir} \
-DCMAKE_INSTALL_PREFIX=%{pkg_prefix} \
+ -DCMAKE_INSTALL_RPATH=%{pkg_prefix}/%{pkg_libdir} \
-DCMAKE_LINKER=%rocmllvm_bindir/ld.lld \
-DCMAKE_AR=%rocmllvm_bindir/llvm-ar \
-DCMAKE_RANLIB=%rocmllvm_bindir/llvm-ranlib \
-DCMAKE_BUILD_TYPE=%build_type \
-DCMAKE_PREFIX_PATH=%{rocmllvm_cmakedir}/.. \
- -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_SKIP_RPATH=%{skip_install_rpath} \
+ -DCMAKE_SKIP_INSTALL_RPATH=%{skip_install_rpath} \
-DROCM_SYMLINK_LIBS=OFF \
-DHIP_PLATFORM=amd \
-DGPU_TARGETS=%{rocm_gpu_list_default} \
@@ -305,6 +315,13 @@ mkdir -p %{buildroot}/%{pkg_prefix}/share/hipsparse/matrices
install -pm 644 %{_builddir}/hipsparse-test-matrices/* %{buildroot}/%{pkg_prefix}/share/hipsparse/matrices
%endif
+%if %{with compat}
+# ERROR 0008: file '/usr/lib64/rocm/rocm-7.2/lib/libhipsparse.so.4.2.0'
+# contains the $ORIGIN runpath specifier at the wrong position in
+# [/usr/lib64/rocm/rocm-7.2/lib:$ORIGIN/../lib:$ORIGIN/../lib/hipsparse/lib]
+chrpath -r %{pkg_prefix}/%{pkg_libdir} %{buildroot}%{pkg_prefix}/%{pkg_libdir}/lib%{pkg_library_name}.so.%{pkg_library_version}.*
+%endif
+
%files -n %{pkg_name}
%doc README.md
%license LICENSE.md
@@ -331,6 +348,9 @@ install -pm 644 %{_builddir}/hipsparse-test-matrices/* %{buildroot}/%{pkg_prefix
%endif
%changelog
+* Sat Jun 20 2026 Tom Rix <Tom.Rix@amd.com> - 7.2.0-7
+- merge compat changes
+
* Tue Apr 21 2026 Tom Rix <Tom.Rix@amd.com> - 7.2.0-6
- Generate suse package name
reply other threads:[~2026-06-20 15:51 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=178197071383.1.16450826882991228150.rpms-hipsparse-a6fb66b1a8f1@fedoraproject.org \
--to=tom.rix@amd.com \
--cc=git-commits@fedoraproject.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