public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/hipblas] rawhide: merge compat changes
@ 2026-06-27  0:04 Tom Rix
  0 siblings, 0 replies; only message in thread
From: Tom Rix @ 2026-06-27  0:04 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/hipblas
            Branch : rawhide
            Commit : 389628c0f48b57ef5c9db419f9130da1994c3bcb
            Author : Tom Rix <Tom.Rix@amd.com>
            Date   : 2026-06-26T17:04:25-07:00
            Stats  : +22/-5 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/hipblas/c/389628c0f48b57ef5c9db419f9130da1994c3bcb?branch=rawhide

            Log:
            merge compat changes

Signed-off-by: Tom Rix <Tom.Rix@amd.com>

---
diff --git a/hipblas.spec b/hipblas.spec
index 04edc61..7c1ae8f 100644
--- a/hipblas.spec
+++ b/hipblas.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}
@@ -94,14 +94,15 @@ Version:        %{rocm_version}
 %if %{with preview}
 Release:        0%{?dist}
 %else
-Release:        5%{?dist}
+Release:        6%{?dist}
 %endif
 Summary:        ROCm BLAS marshaling library
-License:        MIT AND 0BSD
+License:        MIT
 URL:            https://github.com/ROCm/rocm-libraries
 
 Source0:        %{url}/releases/download/%{pkg_src}/%{upstreamname}.tar.gz#/%{upstreamname}-%{version}.tar.gz
 
+BuildRequires:  chrpath
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 %if 0%{?suse_version}
@@ -114,6 +115,7 @@ BuildRequires:  rocblas%{pkg_suffix}-devel
 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}
@@ -132,6 +134,10 @@ BuildRequires:  python3-pyyaml
 %endif
 
 Provides:       hipblas%{pkg_suffix} = %{version}-%{release}
+Requires:       rocm-filesystem%{pkg_suffix}
+Requires:       rocm-hip%{pkg_suffix}
+Requires:       rocblas%{pkg_suffix}
+Requires:       rocsolver%{pkg_suffix}
 
 # Only x86_64 works right now:
 ExclusiveArch:  x86_64
@@ -159,6 +165,7 @@ Summary:        Shared libraries for %{name}
 Summary:        Libraries and headers for %{name}
 Requires:       %{pkg_name}%{?_isa} = %{version}-%{release}
 Requires:       hipblas-common%{pkg_suffix}-devel
+Requires:       rocm-filesystem%{pkg_suffix}
 
 %description devel
 %{summary}
@@ -167,6 +174,7 @@ Requires:       hipblas-common%{pkg_suffix}-devel
 %package test
 Summary:        Tests for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       rocm-filesystem%{pkg_suffix}
 
 %description test
 %{summary}
@@ -188,12 +196,14 @@ sed -i -e 's@find_package(Git REQUIRED)@#find_package(Git REQUIRED)@' library/CM
     -DCMAKE_Fortran_COMPILER=gfortran \
     -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 \
     -DBUILD_CLIENTS_BENCHMARKS=%{build_test} \
@@ -208,6 +218,10 @@ sed -i -e 's@find_package(Git REQUIRED)@#find_package(Git REQUIRED)@' library/CM
 # Extra license
 rm -f %{buildroot}%{pkg_prefix}/share/doc/hipblas/LICENSE.md
 
+%if %{with compat}
+chrpath -r %{pkg_prefix}/%{pkg_libdir} %{buildroot}%{pkg_prefix}/%{pkg_libdir}/lib%{pkg_library_name}.so.%{pkg_library_version}.*
+%endif
+
 %files  -n %{pkg_name}
 %license LICENSE.md
 %doc README.md
@@ -224,6 +238,9 @@ rm -f %{buildroot}%{pkg_prefix}/share/doc/hipblas/LICENSE.md
 %endif
 
 %changelog
+* Fri Jun 26 2026 Tom Rix <Tom.Rix@amd.com> - 7.2.0-6
+- merge compat changes
+
 * Mon Apr 20 2026 Tom Rix <Tom.Rix@amd.com> - 7.2.0-5
 - Generate suse package name
 

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-06-27  0:04 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-27  0:04 [rpms/hipblas] rawhide: merge compat changes Tom Rix

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox