From ea4566354f0643b0daa49d842a99e6dbd256cb4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenz=20H=C3=BCdepohl?= <dev@stellardeath.org> Date: Wed, 1 Apr 2020 10:21:44 +0200 Subject: [PATCH] More fixes for prjconf --- mpcdf_common.py | 1 + mpcdf_setup_software_project.py | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/mpcdf_common.py b/mpcdf_common.py index fabb3bd..58e3a65 100644 --- a/mpcdf_common.py +++ b/mpcdf_common.py @@ -60,6 +60,7 @@ def dist_prjconf_tags(distribution): centos8_prjconf_tags = textwrap.dedent( """ + Substitute: python-devel python3-devel ExpandFlags: module:python36-3.6 """).strip() diff --git a/mpcdf_setup_software_project.py b/mpcdf_setup_software_project.py index 9f4c485..308c346 100644 --- a/mpcdf_setup_software_project.py +++ b/mpcdf_setup_software_project.py @@ -56,6 +56,12 @@ def do_mpcdf_setup_software_project(self, subcmd, opts, *args): prjconf.append("Runscripts: mpcdf") prjconf.append("Preinstall: mpcdf_modules") prjconf.append("Preinstall: brp_mpcdf_modules") + prjconf.append("") + prjconf.append("Macros:") + prjconf.append("%have_mpcdf_compiler 0") + prjconf.append("%have_mpcdf_mpi 0") + prjconf.append("%have_mpcdf_cuda 0") + prjconf.append(":Macros") software_meta = mpcdf_common.project_meta(api_url, "software") -- GitLab