pool/gnu-compilers-hpc
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1046220 from science:HPC

Browse Source 
- Fix compatibility for SLE-12: define _rpmmacrodir after hpc_init. (forwarded request 1046219 from eeich)

OBS-URL: https://build.opensuse.org/request/show/1046220
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnu-compilers-hpc?expand=0&rev=16
This commit is contained in:
Dominique Leuenberger 2023-01-03 14:05:01 +00:00 committed by Git OBS Bridge
commit 284df5b881
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gnu-compilers-hpc.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Jan 2 15:30:36 UTC 2023 - Egbert Eich <eich@suse.com>
- Fix compatibility for SLE-12: define _rpmmacrodir after hpc_init.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Dec 13 15:31:07 UTC 2022 - Egbert Eich <eich@suse.com> Tue Dec 13 15:31:07 UTC 2022 - Egbert Eich <eich@suse.com>

4
gnu-compilers-hpc.spec
View File

@ -1,7 +1,7 @@
# #
# spec file # spec file
# #
# Copyright (c) 2022 SUSE LLC # Copyright (c) 2023 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -64,7 +64,6 @@ ExclusiveArch: do_not_build
ExclusiveArch: do-not-build ExclusiveArch: do-not-build
%endif %endif
%{!?_rpmmacrodir:%define _rpmmacrodir %{_sysconfdir}/rpm}
# Keep in sync with macros.hpc-gnu # Keep in sync with macros.hpc-gnu
# ab >= 40 - version: a.b to accompodate for old gcc version scheme of gcc < 5 # ab >= 40 - version: a.b to accompodate for old gcc version scheme of gcc < 5
%global hpc_gnu_bin_version %{?c_f_ver:-%(v=%c_f_ver; [ $v -lt 40 ] && echo $v || %global hpc_gnu_bin_version %{?c_f_ver:-%(v=%c_f_ver; [ $v -lt 40 ] && echo $v ||
@ -84,6 +83,7 @@ ExclusiveArch: do-not-build
%endif %endif
%global hpc_gnu_dir gnu%{hpc_gnu_dep_version} %global hpc_gnu_dir gnu%{hpc_gnu_dep_version}
%hpc_init -C -c %compiler_family %{?c_f_ver:-v %{c_f_ver}} %hpc_init -C -c %compiler_family %{?c_f_ver:-v %{c_f_ver}}
%{!?_rpmmacrodir:%define _rpmmacrodir %{_sysconfdir}/rpm}
Summary: SUSE HPC GNU Compiler Toolchain environment Summary: SUSE HPC GNU Compiler Toolchain environment
License: BSD-3-Clause License: BSD-3-Clause