diff --git a/openblas.changes b/openblas.changes index 3707a34..0b6f232 100644 --- a/openblas.changes +++ b/openblas.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Oct 27 11:26:28 UTC 2023 - Stefan BrĂ¼ns + +- Propagate the correct CPU count to the pkgconfig file, see + gh#OpenMathLib/OpenBLAS#4275. + ------------------------------------------------------------------- Tue Oct 17 02:18:53 UTC 2023 - Bernhard Wiedemann diff --git a/openblas.spec b/openblas.spec index bc60073..23e92c3 100644 --- a/openblas.spec +++ b/openblas.spec @@ -444,8 +444,11 @@ make MAKE_NB_JOBS=$jobs %{?openblas_target} %{?build_flags} \ %hpc_setup_compiler %endif -# Install serial library and headers +# Install library and headers +# Pass NUM_THREADS again, as it is not propagated from the build step +# https://github.com/OpenMathLib/OpenBLAS/issues/4275 %make_install %{?build_flags} \ + NUM_THREADS=%{num_threads} \ OPENBLAS_LIBRARY_DIR=%{p_libdir} \ OPENBLAS_INCLUDE_DIR=%{p_includedir} \ OPENBLAS_CMAKE_DIR=%{p_cmakedir} \ @@ -457,7 +460,6 @@ make MAKE_NB_JOBS=$jobs %{?openblas_target} %{?build_flags} \ sed -i '/#define OPENBLAS_NEEDBUNDERSCORE/,/#define OPENBLAS_VERSION/{//!d}' \ %{buildroot}%{p_includedir}/openblas_config.h %endif -sed -i 's/MAX_THREADS=[0-9]*/MAX_THREADS=4/' %{buildroot}%{_libdir}/*/pkgconfig/openblas.pc ||: %if %{without hpc}