Accepting request 1120798 from home:StefanBruens:branches:science

- Propagate the correct CPU count to the pkgconfig file, see
  gh#OpenMathLib/OpenBLAS#4275.

OBS-URL: https://build.opensuse.org/request/show/1120798
OBS-URL: https://build.opensuse.org/package/show/science/openblas?expand=0&rev=162
This commit is contained in:
Egbert Eich 2023-11-05 14:41:45 +00:00 committed by Git OBS Bridge
parent 158cdf946c
commit 5f43c36430
2 changed files with 10 additions and 2 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Oct 27 11:26:28 UTC 2023 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- Propagate the correct CPU count to the pkgconfig file, see
gh#OpenMathLib/OpenBLAS#4275.
-------------------------------------------------------------------
Tue Oct 17 02:18:53 UTC 2023 - Bernhard Wiedemann <bwiedemann@suse.com>

View File

@ -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}