rpm/suse-hpc
SHA256
1
0
Fork 0
forked from pool/suse-hpc
Code Pull Requests Activity

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

Browse Source 
- Add %hpc_python_sitelib and %hpc_python_sitelib_no_singlespec
  to get arch independent module directories for modules.

OBS-URL: https://build.opensuse.org/request/show/952120
OBS-URL: https://build.opensuse.org/package/show/science:HPC/suse-hpc?expand=0&rev=59
This commit is contained in:
Egbert Eich 2022-02-07 12:58:47 +00:00 committed by Git OBS Bridge
parent dca37a71b5
commit 81871d8888
4 changed files with 14 additions and 4 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">07cc46c5ab791219e5971581868fd20b7d661d32</param> <param name="revision">0c6b168b267e48970943805a1fcf2bc2fe7bd7b0</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>

8
macros.hpc
View File

@ -493,10 +493,14 @@ When this package gets updated it installs the latest version of %name. \
# get the python version specific directory for arch specific files in the HPC # get the python version specific directory for arch specific files in the HPC
# directory structure (singlepsec). # directory structure (singlepsec).
# python_sitearch equivalent - for arch specific python modules
%hpc_python_sitearch %{_hpc_python_sysconfig_path %{expand:%__%{python_flavor}} platlib %{?hpc_prefix}} %hpc_python_sitearch %{_hpc_python_sysconfig_path %{expand:%__%{python_flavor}} platlib %{?hpc_prefix}}
# python_sitelib equivalent - for arch independent python modules
%hpc_python_sitelib %{_hpc_python_sysconfig_path %{expand:%__%{python_flavor}} purelib %{?hpc_prefix}}
# same for non-singlespec (using internal %%_hpc_python3) # same for non-singlespec (using internal %%_hpc_python3)
%hpc_python_sitearch_no_singlespec %{_hpc_python_sysconfig_path %{?_hpc_python3:/usr/bin/python3}%{!?_hpc_python3:%{expand:%__%{python_flavor}}} platlib %{?hpc_prefix}} %hpc_python_sitearch_no_singlespec %{_hpc_python_sysconfig_path %{?_hpc_python3:/usr/bin/python3}%{!?_hpc_python3:%{expand:%__%{python_flavor}}} platlib %{?hpc_prefix}}
%hpc_python_sitelib_no_singlespec %{_hpc_python_sysconfig_path %{?_hpc_python3:/usr/bin/python3}%{!?_hpc_python3:%{expand:%__%{python_flavor}}} purelib %{?hpc_prefix}}
%_hpc_python_ver() %(%1 -c "import sysconfig as s; print(s.get_config_var('py_version_short'));") %_hpc_python_ver() %(%1 -c "import sysconfig as s; print(s.get_config_var('py_version_short'));")
@ -615,12 +619,12 @@ end \
*python3) newline='#! /usr/bin/python3' ;; \ *python3) newline='#! /usr/bin/python3' ;; \
%{!?_hpc_python3: \ %{!?_hpc_python3: \
*python2) newline='#! /usr/bin/python2' ;; \ *python2) newline='#! /usr/bin/python2' ;; \
*python1*) %{hpc_verify_python3 $file} && \ *python1*) { %{hpc_verify_python3 $file}; } && \
newline='#! /usr/bin/python3' || : ;; \ newline='#! /usr/bin/python3' || : ;; \
*python) newline='#! /usr/bin/python' ;; } \ *python) newline='#! /usr/bin/python' ;; } \
%{?_hpc_python3: \ %{?_hpc_python3: \
*python2|*python1*|*python) \ *python2|*python1*|*python) \
%{hpc_verify_python3 $file} && \ { %{hpc_verify_python3 $file}; } && \
newline='#! /usr/bin/python3' || : ;; }\ newline='#! /usr/bin/python3' || : ;; }\
*perl) newline='#! /usr/bin/perl' ;; \ *perl) newline='#! /usr/bin/perl' ;; \
*bash) newline='#! /bin/bash' ;; \ *bash) newline='#! /bin/bash' ;; \

6
suse-hpc.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Feb 6 15:55:41 UTC 2022 - Egbert Eich <eich@suse.com>
- Add %hpc_python_sitelib and %hpc_python_sitelib_no_singlespec
to get arch independent module directories for modules.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jan 5 16:00:53 UTC 2022 - Ben Greiner <code@bnavigator.de> Wed Jan 5 16:00:53 UTC 2022 - Ben Greiner <code@bnavigator.de>

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.20211210.07cc46c Version: 0.5.20220206.0c6b168
Release: 0 Release: 0
Source0: macros.hpc Source0: macros.hpc
Source1: dlinfo.c Source1: dlinfo.c