Accepting request 979393 from science:HPC

- Add %hpc_base_dirs macro
  In contrast to %hpc_dirs which also includes the library directory
  this only provides the HPC base directories. (forwarded request 979120 from eeich)

OBS-URL: https://build.opensuse.org/request/show/979393
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/suse-hpc?expand=0&rev=26
This commit is contained in:
Dominique Leuenberger 2022-05-27 22:28:10 +00:00 committed by Git OBS Bridge
commit 870e041641
4 changed files with 16 additions and 5 deletions

View File

@ -6,7 +6,7 @@
<param name="exclude">.git</param> <param name="exclude">.git</param>
<param name="filename">suse-hpc</param> <param name="filename">suse-hpc</param>
<param name="versionformat">0.5.%cd.%h</param> <param name="versionformat">0.5.%cd.%h</param>
<param name="revision">0c6b168b267e48970943805a1fcf2bc2fe7bd7b0</param> <param name="revision">fd76646f99470213a4cfe6c5c11fa1068a0f5e61</param>
<param name="extract">general/dlinfo.c</param> <param name="extract">general/dlinfo.c</param>
<param name="extract">general/macros.hpc</param> <param name="extract">general/macros.hpc</param>
<param name="extract">general/hpc_elf.pl</param> <param name="extract">general/hpc_elf.pl</param>

View File

@ -286,11 +286,15 @@ cat << EOF > %{buildroot}%{hpc_module_dep_base}%{version}
%dir %hpc_mpi_install_path_base \ %dir %hpc_mpi_install_path_base \
%dir %hpc_mpi_install_path %dir %hpc_mpi_install_path
# serial and parallel libraries - use in library package # base dir path only
%hpc_dirs \ %hpc_base_dirs \
%{!?hpc_compiler_family:%dir %{hpc_install_base}} \ %{!?hpc_compiler_family:%dir %{hpc_install_base}} \
%dir %{hpc_install_path_base} \ %dir %{hpc_install_path_base} \
%dir %{hpc_install_path} \ %dir %{hpc_install_path}
# serial and parallel libraries - use in library package
%hpc_dirs \
%{hpc_base_dirs} \
%dir %{hpc_libdir} %dir %{hpc_libdir}
# #

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed May 25 05:56:07 UTC 2022 - Egbert Eich <eich@suse.com>
- Add %hpc_base_dirs macro
In contrast to %hpc_dirs which also includes the library directory
this only provides the HPC base directories.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Feb 6 15:55:41 UTC 2022 - Egbert Eich <eich@suse.com> Sun Feb 6 15:55:41 UTC 2022 - Egbert Eich <eich@suse.com>

View File

@ -20,7 +20,7 @@ Summary: SUSE HPC Environment
License: BSD-3-Clause License: BSD-3-Clause
Group: Productivity/Clustering/Computing Group: Productivity/Clustering/Computing
Name: suse-hpc Name: suse-hpc
Version: 0.5.20220206.0c6b168 Version: 0.5.20220525.fd76646
Release: 0 Release: 0
Source0: macros.hpc Source0: macros.hpc
Source1: dlinfo.c Source1: dlinfo.c