More fixes for prjconf

ea456635 · Lorenz Hüdepohl · 0edf21b6 · ea456635 · ea456635
Commit ea456635 authored Apr 01, 2020 by Lorenz Hüdepohl
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

mpcdf_common.py mpcdf_common.py +1 -0

mpcdf_setup_software_project.py mpcdf_setup_software_project.py +6 -0

No files found.
--- 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()


--- 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")