- Fix %%hpc_base during hpc_init to allow for changes to %%_prefix.

OBS-URL: https://build.opensuse.org/package/show/science:HPC/suse-hpc?expand=0&rev=50
This commit is contained in:
Egbert Eich 2020-07-23 17:45:40 +00:00 committed by Git OBS Bridge
parent 3899b1e4e6
commit a613aeea4c
3 changed files with 7 additions and 1 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.4.%h</param> <param name="versionformat">0.4.%h</param>
<param name="revision">d55686f0e90750122e3a56f4a38e3cb05a02381c</param> <param name="revision">663bf86ed7dc0d3e5526d4b7c7edaf5d04de648f</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

@ -117,6 +117,7 @@ EOF\
# -V: <arg>: set MPI version to <arg> (optional - default:) # -V: <arg>: set MPI version to <arg> (optional - default:)
# -e: <arg>: program name extension # -e: <arg>: program name extension
%_hpc_init(Cc:Mm:v:V:e:)\ %_hpc_init(Cc:Mm:v:V:e:)\
%global hpc_base %{expand:%hpc_base} \
%{-m:%{!-c:%{error: Cannot est MPI family without compiler}}} \ %{-m:%{!-c:%{error: Cannot est MPI family without compiler}}} \
%{-c:%{expand: %%global hpc_compiler_family %{-c*}}} \ %{-c:%{expand: %%global hpc_compiler_family %{-c*}}} \
%{-m: %{expand: %%global hpc_mpi_family %{-m*}}} \ %{-m: %{expand: %%global hpc_mpi_family %{-m*}}} \

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Jul 23 17:42:34 UTC 2020 - Egbert Eich <eich@suse.com>
- Fix %%hpc_base during hpc_init to allow for changes to %%_prefix.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu May 7 21:50:13 UTC 2020 - Egbert Eich <eich@suse.com> Thu May 7 21:50:13 UTC 2020 - Egbert Eich <eich@suse.com>