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

Accepting request 1119953 from home:eeich:branches:science:HPC

Browse Source 
- Handle %hpc_localstatedir and %hpc_sharedstatedir only when
  changed from %_localstatedir and %_sharedstatedir to avoid
  infinite recursion.

OBS-URL: https://build.opensuse.org/request/show/1119953
OBS-URL: https://build.opensuse.org/package/show/science:HPC/suse-hpc?expand=0&rev=64
This commit is contained in:
Egbert Eich 2023-10-24 11:08:55 +00:00 committed by Git OBS Bridge
parent c843a8d1f6
commit aefcedb73c
4 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_service
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">968c9cb1cc13f668529623cda4ec25af1495c7e0</param> <param name="revision">87c7989e7349d543ba33aada425716f6ffcba0fb</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>

20
macros.hpc
View File

@ -741,9 +741,15 @@ sys.exit(0)" %{1}
%define _infodir %{hpc_infodir} \ %define _infodir %{hpc_infodir} \
%define _libdir %{hpc_libdir} \ %define _libdir %{hpc_libdir} \
%define _libexecdir %{hpc_libexecdir} \ %define _libexecdir %{hpc_libexecdir} \
%if x%{?hpc_localstatedir} != x%{_localstatedir} \
%define _localstatedir %{hpc_localstatedir} \
%endif \
%define _mandir %{hpc_mandir} \ %define _mandir %{hpc_mandir} \
%define _prefix %{hpc_prefix} \ %define _prefix %{hpc_prefix} \
%define _sbindir %{hpc_sbindir} \ %define _sbindir %{hpc_sbindir} \
%if x%{?hpc_sharedstatedir} != x%{_sharedstatedir} \
%define _sharedstatedir %{hpc_sharedstatedir} \
%endif \
#Do NOT define _sysconfig to %%hpc_sysconfig here! #Do NOT define _sysconfig to %%hpc_sysconfig here!
%cmake \\\ %cmake \\\
%undefine __cmake \\\ %undefine __cmake \\\
@ -753,9 +759,15 @@ sys.exit(0)" %{1}
%undefine _infodir \\\ %undefine _infodir \\\
%undefine _libdir \\\ %undefine _libdir \\\
%undefine _libexecdir \\\ %undefine _libexecdir \\\
%if x%{?hpc_localstatedir} != x%{_localstatedir} \\\
%undefine _localstatedir \\\
%endif \\\
%undefine _mandir \\\ %undefine _mandir \\\
%undefine _prefix \\\ %undefine _prefix \\\
%undefine _sbindir \\\ %undefine _sbindir \\\
%if x%{?hpc_sharedstatedir} != x%{_sharedstatedir} \\\
%undefine _sharedstatedir \\\
%endif \\\
} }
# wraps macro from macros.meson - paths replaced by HPC paths. # wraps macro from macros.meson - paths replaced by HPC paths.
@ -769,11 +781,15 @@ sys.exit(0)" %{1}
%define _infodir %{hpc_infodir} \ %define _infodir %{hpc_infodir} \
%define _libdir %{hpc_libdir} \ %define _libdir %{hpc_libdir} \
%define _libexecdir %{hpc_libexecdir} \ %define _libexecdir %{hpc_libexecdir} \
%if x%{?hpc_localstatedir} != x%{_localstatedir} \
%define _localstatedir %{hpc_localstatedir} \ %define _localstatedir %{hpc_localstatedir} \
%endif \
%define _mandir %{hpc_mandir} \ %define _mandir %{hpc_mandir} \
%define _prefix %{hpc_prefix} \ %define _prefix %{hpc_prefix} \
%define _sbindir %{hpc_sbindir} \ %define _sbindir %{hpc_sbindir} \
%if x%{?hpc_sharedstatedir} != x%{_sharedstatedir} \
%define _sharedstatedir %{hpc_sharedstatedir} \ %define _sharedstatedir %{hpc_sharedstatedir} \
%endif \
%define _sysconfdir %{hpc_sysconfdir} \ %define _sysconfdir %{hpc_sysconfdir} \
%meson \\\ %meson \\\
%undefine __meson \\\ %undefine __meson \\\
@ -783,10 +799,14 @@ sys.exit(0)" %{1}
%undefine _infodir \\\ %undefine _infodir \\\
%undefine _libdir \\\ %undefine _libdir \\\
%undefine _libexecdir \\\ %undefine _libexecdir \\\
%if x%{?hpc_localstatedir} != x%{_localstatedir} \\\
%undefine _localstatedir \\\ %undefine _localstatedir \\\
%endif \\\
%undefine _mandir \\\ %undefine _mandir \\\
%undefine _prefix \\\ %undefine _prefix \\\
%undefine _sbindir \\\ %undefine _sbindir \\\
%if x%{?hpc_sharedstatedir} != x%{_sharedstatedir} \\\
%undefine _sharedstatedir \\\ %undefine _sharedstatedir \\\
%endif \\\
%undefine _sysconfdir \\\ %undefine _sysconfdir \\\
} }

7
suse-hpc.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Oct 24 09:09:47 UTC 2023 - Egbert Eich <eich@suse.com>
- Handle %hpc_localstatedir and %hpc_sharedstatedir only when
changed from %_localstatedir and %_sharedstatedir to avoid
infinite recursion.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 1 07:43:38 UTC 2023 - Egbert Eich <eich@suse.com> Mon May 1 07:43:38 UTC 2023 - Egbert Eich <eich@suse.com>

2
suse-hpc.spec
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.20230501.968c9cb Version: 0.5.20231024.0226cb7
Release: 0 Release: 0
Source0: macros.hpc Source0: macros.hpc
Source1: dlinfo.c Source1: dlinfo.c