public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/hipsolver] rawhide: Fix RHEL build
@ 2026-08-19 22:50 Tom Rix
  0 siblings, 0 replies; only message in thread
From: Tom Rix @ 2026-08-19 22:50 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/hipsolver
            Branch : rawhide
            Commit : 4c9c52f38697110fed8d4f9305d4144639f90a88
            Author : Tom Rix <Tom.Rix@amd.com>
            Date   : 2026-08-19T15:49:22-07:00
            Stats  : +54/-1 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/hipsolver/c/4c9c52f38697110fed8d4f9305d4144639f90a88?branch=rawhide

            Log:
            Fix RHEL build

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

---
diff --git a/0001-hipsolver-no-lapack-devel.patch b/0001-hipsolver-no-lapack-devel.patch
new file mode 100644
index 0000000..26063fd
--- /dev/null
+++ b/0001-hipsolver-no-lapack-devel.patch
@@ -0,0 +1,33 @@
+From 9372d766f126c86d2ca1db5a4310e31dff85ddcb Mon Sep 17 00:00:00 2001
+From: Tom Rix <Tom.Rix@amd.com>
+Date: Wed, 19 Aug 2026 15:06:51 -0700
+Subject: [PATCH] hipsolver no lapack devel
+
+---
+ projects/hipsolver/CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/projects/hipsolver/CMakeLists.txt b/projects/hipsolver/CMakeLists.txt
+index 06fe8b4bc29b..097697cb10c3 100644
+--- a/projects/hipsolver/CMakeLists.txt
++++ b/projects/hipsolver/CMakeLists.txt
+@@ -149,6 +149,7 @@ if(HIP_PLATFORM STREQUAL nvidia)
+   find_package(CUDA REQUIRED)
+ endif()
+ 
++if(FALSE) # for rhel
+ if(NOT "${HIP_PLATFORM}" STREQUAL "nvidia")
+     # TODO: This LAPACK dependency is only required to support geev
+     # It should be removed once geev is implemented in rocSOLVER
+@@ -275,7 +276,7 @@ if(NOT "${HIP_PLATFORM}" STREQUAL "nvidia")
+         endif()
+     endif()
+ endif()
+-
++endif()
+ 
+ # Append our library helper cmake path
+ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake )
+-- 
+2.55.0
+

diff --git a/hipsolver.spec b/hipsolver.spec
index ef3d688..0e4ed73 100644
--- a/hipsolver.spec
+++ b/hipsolver.spec
@@ -89,7 +89,7 @@ Version:        %{rocm_version}
 %if %{with preview}
 Release:        0%{?dist}
 %else
-Release:        1%{?dist}
+Release:        2%{?dist}
 %endif
 Summary:        ROCm SOLVER marshaling library
 License:        MIT
@@ -97,6 +97,8 @@ URL:            https://github.com/ROCm/rocm-libraries
 
 Source0:        %{url}/releases/download/%{pkg_src}/%{upstreamname}.tar.gz#/%{upstreamname}-%{version}.tar.gz
 
+Patch1:         0001-hipsolver-no-lapack-devel.patch
+
 BuildRequires:  chrpath
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
@@ -133,6 +135,7 @@ BuildRequires:  lapack-static
 %endif
 %endif
 
+%if 0%{?fedora}
 # needed for geev
 # https://www.netlib.org/lapack/explore-html/d4/d68/group__geev.html
 #
@@ -142,6 +145,9 @@ BuildRequires:  lapack-static
 #     "/usr/lib64/libblas.a"
 BuildRequires:  blas-static
 BuildRequires:  lapack-static
+%else
+BuildRequires:  flexiblas-devel
+%endif
 
 Provides:       hipsolver%{pkg_suffix} = %{version}-%{release}
 Requires:       rocm-filesystem%{pkg_suffix}
@@ -193,6 +199,17 @@ Requires:       %{pkg_name}%{?_isa} = %{version}-%{release}
 %prep
 %autosetup -p3 -n %{upstreamname}
 
+# RHEL does not have lapack-devel
+# Patch from above takes are of cmake not requiring something not available
+%if 0%{?rhel}
+# Fix the link to flexiblas
+sed -i -e 's@target_link_libraries(hipsolver PRIVATE lapack_libraries)@target_link_libraries(hipsolver PRIVATE -lflexiblas64)@' library/src/CMakeLists.txt
+%else
+# disable the patch's effect
+sed -i -e 's@if(FALSE) # for rhel@if(TRUE) # for rhel@' CMakeLists.txt
+%endif
+
+
 %build
 %cmake \
     -DCMAKE_C_COMPILER=%rocmllvm_bindir/amdclang \
@@ -251,6 +268,9 @@ patchelf --remove-needed libgcc_s.so.1 %{buildroot}%{pkg_prefix}/%{pkg_libdir}/l
 %endif
 
 %changelog
+* Wed Aug 19 2026 Tom Rix <Tom.Rix@amd.com> - 7.14.0-2
+- Fix RHEL build
+
 * Sat Aug 8 2026 Tom Rix <Tom.Rix@amd.com> - 7.14.0-1
 - Update to 7.14
 

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

only message in thread, other threads:[~2026-08-19 22:50 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-19 22:50 [rpms/hipsolver] rawhide: Fix RHEL build Tom Rix

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