[rpms/hipfort] rawhide: Fix check

[rpms/hipfort] rawhide: Fix check

[Tom Rix]

            A new commit has been pushed.

            Repo   : rpms/hipfort
            Branch : rawhide
            Commit : 566811d836c3bff8209ae052b40463de0c508582
            Author : Tom Rix <Tom.Rix@amd.com>
            Date   : 2026-08-21T07:26:26-07:00
            Stats  : +9/-1 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/hipfort/c/566811d836c3bff8209ae052b40463de0c508582?branch=rawhide

            Log:
            Fix check

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

---
diff --git a/hipfort.spec b/hipfort.spec
index 7e677ef..4a6546a 100644
--- a/hipfort.spec
+++ b/hipfort.spec
@@ -50,9 +50,12 @@
 %global build_test OFF
 %endif
 
+%global gpu_list %{rocm_gpu_list_default}
+%global _gpu_list gfx1100
+
 Name:           hipfort%{pkg_suffix}
 Version:        %{rocm_version}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Fortran interfaces for ROCm libraries
 
 Url:            https://github.com/ROCm/%{upstreamname}
@@ -72,6 +75,7 @@ BuildRequires:  hipsparse%{pkg_suffix}-devel
 BuildRequires:  rocm-cmake%{pkg_suffix}
 BuildRequires:  rocblas%{pkg_suffix}-devel
 BuildRequires:  rocm-compilersupport%{pkg_suffix}-macros
+BuildRequires:  rocm-rpm-macros%{pkg_suffix}
 BuildRequires:  rocfft%{pkg_suffix}-devel
 BuildRequires:  rocrand%{pkg_suffix}-devel
 BuildRequires:  rocsolver%{pkg_suffix}-devel
@@ -106,6 +110,7 @@ sed -i '/hipfort_add_test(hip graph f2003)/d' test/CMakeLists.txt
     -DCMAKE_C_COMPILER=%rocmllvm_bindir/amdclang \
     -DCMAKE_CXX_COMPILER=%rocmllvm_bindir/amdclang++ \
     -DCMAKE_Fortran_FLAGS="-fPIE -L%{pkg_prefix}/%{pkg_libdir}" \
+    -DCMAKE_HIP_ARCHITECTURES=%{gpu_list} \
     -DCMAKE_INSTALL_LIBDIR=%{pkg_libdir} \
     -DCMAKE_INSTALL_PREFIX=%{pkg_prefix} \
     -DCMAKE_SKIP_RPATH=ON \
@@ -147,6 +152,9 @@ rm -f %{buildroot}%{pkg_prefix}/share/doc/hipfort/LICENSE
 %{pkg_prefix}/%{pkg_libdir}/cmake/hipfort/
 
 %changelog
+* Fri Aug 21 2026 Tom Rix <Tom.Rix@amd.com> - 7.14.0-2
+- Fix check
+
 * Thu Aug 20 2026 Tom Rix <Tom.Rix@amd.com> - 7.14.0-1
 - Update to 7.14.0
 

[rpms/hipfort] rawhide: Fix check

[Tom Rix]

            A new commit has been pushed.

            Repo   : rpms/hipfort
            Branch : rawhide
            Commit : 16f18f1eb2e84d107229038be6ee7f95838fcbce
            Author : Tom Rix <Tom.Rix@amd.com>
            Date   : 2026-07-15T07:14:37-07:00
            Stats  : +12/-13 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/hipfort/c/16f18f1eb2e84d107229038be6ee7f95838fcbce?branch=rawhide

            Log:
            Fix check

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

---
diff --git a/hipfort.spec b/hipfort.spec
index b5d11c0..bba0fc4 100644
--- a/hipfort.spec
+++ b/hipfort.spec
@@ -46,10 +46,15 @@
 
 # Needs ROCm HW so is only suitable for local testing
 %bcond_with check
+%if %{with check}
+%global build_test ON
+%else
+%global build_test OFF
+%endif
 
 Name:           hipfort%{pkg_suffix}
 Version:        %{rocm_version}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Fortran interfaces for ROCm libraries
 
 Url:            https://github.com/ROCm/%{upstreamname}
@@ -116,24 +121,15 @@ sed -i 's@cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR@cmake_minimum_requir
     -DROCM_SYMLINK_LIBS=OFF \
     -DHIP_PLATFORM=amd \
     -DBUILD_SHARED_LIBS=ON \
+    -DBUILD_TESTING=%{build_test} \
     -DCMAKE_BUILD_TYPE=%{build_type}
 
 %cmake_build
 
-# Assume you _just_ installed hipfort-devel as the tests assume hipfc is in the PATH
 %if %{with check}
 %check
-# Mixing rpm gfortran security flags with hipcc does not work
-# Override the normal rpm flags
-export CFLAGS=""
-export CXXFLAGS=""
-export FFLAGS=""
-export FCFLAGS=""
-export LDFLAGS=""
-# hipfc needs these set to find things
-export HIPFORT="%{pkg_prefix}"
-export ROCM_PATH="%{pkg_prefix}"
-%cmake_build -t all-tests-run
+export LD_LIBRARY_PATH=${PWD}/%{_vpath_builddir}/lib:$LD_LIBRARY_PATH
+%ctest -j1
 %endif
 
 %install
@@ -162,6 +158,9 @@ rm -f %{buildroot}%{pkg_prefix}/share/doc/hipfort/LICENSE
 %{pkg_prefix}/%{pkg_libdir}/cmake/hipfort/
 
 %changelog
+* Wed Jul 15 2026 Tom Rix <Tom.Rix@amd.com> - 7.2.0-3
+- Fix check
+
 * Fri Feb 20 2026 Tom Rix <Tom.Rix@amd.com> - 7.2.0-2
 - Fix so version